[Libreoffice-commits] core.git: include/vcl svx/source vcl/source

[Noel Grandin]

 include/vcl/window.hxx                               |    2 +-
 svx/source/accessibility/AccessibleFrameSelector.cxx |    2 +-
 vcl/source/control/edit.cxx                          |    2 +-
 vcl/source/window/dlgctrl.cxx                        |    8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit b406664c0c3f9c8a383e47c7eb045657cd3fdd83
Author: Noel Grandin <noel at peralex.com>
Date:   Thu May 28 13:01:56 2015 +0200

    GetFocusFlags::Cursor->GetFocusFlags::CURSOR
    
    to avoid name-clash with X11 headers
    
    Change-Id: I727c523f6d9bd7d4db28fe7427e053903626be00

diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 9f9f73d..0aa057d 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -362,7 +362,7 @@ enum class GetFocusFlags
 {
     NONE                   = 0x0000,
     Tab                    = 0x0001,
-    Cursor                 = 0x0002,
+    CURSOR                 = 0x0002, // avoid name-clash with X11 #define
     Mnemonic               = 0x0004,
     F6                     = 0x0008,
     Forward                = 0x0010,
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx
index 2227951..1a22ae6 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -468,7 +468,7 @@ void    AccFrameSelector::NotifyFocusListeners(bool bGetFocus)
         GetFocusFlags nFocusFlags = mpFrameSel->GetGetFocusFlags();
         if(nFocusFlags & GetFocusFlags::Tab)
             aEvent.FocusFlags |= AwtFocusChangeReason::TAB;
-        if(nFocusFlags & GetFocusFlags::Cursor)
+        if(nFocusFlags & GetFocusFlags::CURSOR)
             aEvent.FocusFlags |= AwtFocusChangeReason::CURSOR;
         if(nFocusFlags & GetFocusFlags::Mnemonic)
             aEvent.FocusFlags |= AwtFocusChangeReason::MNEMONIC;
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 05eb605..51982fc 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1901,7 +1901,7 @@ void Edit::GetFocus()
 
         SelectionOptions nSelOptions = GetSettings().GetStyleSettings().GetSelectionOptions();
         if ( !( GetStyle() & (WB_NOHIDESELECTION|WB_READONLY) )
-                && ( GetGetFocusFlags() & (GetFocusFlags::Init|GetFocusFlags::Tab|GetFocusFlags::Cursor|GetFocusFlags::Mnemonic) ) )
+                && ( GetGetFocusFlags() & (GetFocusFlags::Init|GetFocusFlags::Tab|GetFocusFlags::CURSOR|GetFocusFlags::Mnemonic) ) )
         {
             if ( nSelOptions & SelectionOptions::ShowFirst )
             {
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index 5cd0706..3039e78 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -543,7 +543,7 @@ namespace
 
             if (isSuitableDestination(pWindow))
             {
-                pWindow->ImplControlFocus( GetFocusFlags::Cursor | GetFocusFlags::Forward );
+                pWindow->ImplControlFocus( GetFocusFlags::CURSOR | GetFocusFlags::Forward );
                 return true;
             }
         }
@@ -554,7 +554,7 @@ namespace
 
             if (isSuitableDestination(pWindow))
             {
-                pWindow->ImplControlFocus( GetFocusFlags::Cursor | GetFocusFlags::Forward );
+                pWindow->ImplControlFocus( GetFocusFlags::CURSOR | GetFocusFlags::Forward );
                 return true;
             }
         }
@@ -868,7 +868,7 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput )
                         if (isSuitableDestination(pWindow))
                         {
                             if ( pWindow != pSWindow )
-                                pWindow->ImplControlFocus( GetFocusFlags::Cursor | GetFocusFlags::Backward );
+                                pWindow->ImplControlFocus( GetFocusFlags::CURSOR | GetFocusFlags::Backward );
                             return true;
                         }
 
@@ -898,7 +898,7 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput )
 
                     if (isSuitableDestination(pWindow))
                     {
-                        pWindow->ImplControlFocus( GetFocusFlags::Cursor | GetFocusFlags::Backward );
+                        pWindow->ImplControlFocus( GetFocusFlags::CURSOR | GetFocusFlags::Backward );
                         return true;
                     }