fix for last commit

[wxWidgets.git] / src / common / utilscmn.cpp

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index e35cd29f78847f62df81ff2addb728dba195d74e..6020b8780d182b7ee3c29203f59b716dba033cca 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -66,6 +66,10 @@
 
 #if wxUSE_GUI
     #include "wx/colordlg.h"
+    #include "wx/notebook.h"
+    #include "wx/frame.h"
+    #include "wx/statusbr.h"
+    #include "wx/toolbar.h"
 #endif // wxUSE_GUI
 
 #include <time.h>
@@ -325,7 +329,7 @@ int wxHexToDec(const wxString& buf)
   else
     secondDigit = buf.GetChar(1) - wxT('0');
 
-  return firstDigit * 16 + secondDigit;
+  return (firstDigit & 0xF) * 16 + (secondDigit & 0xF );
 }
 
 // Convert decimal integer to 2-character hex string
@@ -500,23 +504,23 @@ wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
                 else {
                     // several special cases
                     current.MakeUpper();
-                    if ( current == wxT("DEL") ) {
+                    if ( current == _("DEL") ) {
                         keyCode = WXK_DELETE;
                     }
-                    else if ( current == wxT("DELETE") ) {
+                    else if ( current == _("DELETE") ) {
                         keyCode = WXK_DELETE;
                     }
-                    else if ( current == wxT("INS") ) {
+                    else if ( current == _("INS") ) {
                         keyCode = WXK_INSERT;
                     }
-                    else if ( current == wxT("INSERT") ) {
+                    else if ( current == _("INSERT") ) {
                         keyCode = WXK_INSERT;
                     }
 #if 0
-                    else if ( current == wxT("PGUP") ) {
+                    else if ( current == _("PGUP") ) {
                         keyCode = VK_PRIOR;
                     }
-                    else if ( current == wxT("PGDN") ) {
+                    else if ( current == _("PGDN") ) {
                         keyCode = VK_NEXT;
                     }
 #endif
@@ -667,17 +671,62 @@ wxFindMenuItemId (wxFrame * frame, const wxString& menuString, const wxString& i
   return menuBar->FindMenuItem (menuString, itemString);
 }
 
-// Try to find the deepest child that contains 'pt'
+// Try to find the deepest child that contains 'pt'.
+// We go backwards, to try to allow for controls that are spacially
+// within other controls, but are still siblings (e.g. buttons within
+// static boxes). Static boxes are likely to be created _before_ controls
+// that sit inside them.
 wxWindow* wxFindWindowAtPoint(wxWindow* win, const wxPoint& pt)
 {
-    wxNode* node = win->GetChildren().First();
+    if (!win->IsShown())
+        return NULL;
+
+    // Hack for wxNotebook case: at least in wxGTK, all pages
+    // claim to be shown, so we must only deal with the selected one.
+    if (win->IsKindOf(CLASSINFO(wxNotebook)))
+    {
+      wxNotebook* nb = (wxNotebook*) win;
+      int sel = nb->GetSelection();
+      if (sel >= 0)
+      {
+        wxWindow* child = nb->GetPage(sel);
+        wxWindow* foundWin = wxFindWindowAtPoint(child, pt);
+        if (foundWin)
+           return foundWin;
+      }
+    }
+    /* Doesn't work
+    // Frame case
+    else if (win->IsKindOf(CLASSINFO(wxFrame)))
+    {
+      // Pseudo-children that may not be mentioned in the child list
+      wxWindowList extraChildren;
+      wxFrame* frame = (wxFrame*) win;
+      if (frame->GetStatusBar())
+        extraChildren.Append(frame->GetStatusBar());
+      if (frame->GetToolBar())
+        extraChildren.Append(frame->GetToolBar());
+
+      wxNode* node = extraChildren.First();
+      while (node)
+      {
+          wxWindow* child = (wxWindow*) node->Data();
+          wxWindow* foundWin = wxFindWindowAtPoint(child, pt);
+          if (foundWin)
+            return foundWin;
+          node = node->Next();
+      }
+    }
+    */
+
+    wxNode* node = win->GetChildren().Last();
     while (node)
     {
         wxWindow* child = (wxWindow*) node->Data();
         wxWindow* foundWin = wxFindWindowAtPoint(child, pt);
         if (foundWin)
-            return foundWin;
-        node = node->Next();
+          return foundWin;
+        node = node->Previous();
     }
 
     wxPoint pos = win->GetPosition();
@@ -694,16 +743,19 @@ wxWindow* wxFindWindowAtPoint(wxWindow* win, const wxPoint& pt)
         return NULL;
 }
 
-wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
+wxWindow* wxGenericFindWindowAtPoint(const wxPoint& pt)
 {
-    wxNode* node = wxTopLevelWindows.First();
+    // Go backwards through the list since windows
+    // on top are likely to have been appended most
+    // recently.
+    wxNode* node = wxTopLevelWindows.Last();
     while (node)
     {
         wxWindow* win = (wxWindow*) node->Data();
         wxWindow* found = wxFindWindowAtPoint(win, pt);
         if (found)
             return found;
-        node = node->Next();
+        node = node->Previous();
     }
     return NULL;
 }
@@ -1019,17 +1071,6 @@ void wxEnableTopLevelWindows(bool enable)
 
 wxWindowDisabler::wxWindowDisabler(wxWindow *winToSkip)
 {
-#ifdef __WXMSW__
-#ifdef __WIN32__
-    // and the top level window too
-    HWND hwndFG = ::GetForegroundWindow();
-    m_winTop = hwndFG ? wxFindWinFromHandle((WXHWND)hwndFG) : (wxWindow *)NULL;
-#else
-    HWND hwndFG = ::GetTopWindow(0);
-    m_winTop = hwndFG ? wxFindWinFromHandle((WXHWND)hwndFG) : (wxWindow *)NULL;
-#endif
-#endif // MSW
-
     // remember the top level windows which were already disabled, so that we
     // don't reenable them later
     m_winDisabled = NULL;
@@ -1071,29 +1112,6 @@ wxWindowDisabler::~wxWindowDisabler()
     }
 
     delete m_winDisabled;
-
-#ifdef __WXMSW__
-#ifdef __WIN32__
-    if ( m_winTop )
-    {
-        if ( !::SetForegroundWindow(GetHwndOf(m_winTop)) )
-        {
-            wxLogLastError(wxT("SetForegroundWindow"));
-        }
-    }
-#else
-    if ( m_winTop )
-    {
-        // 16-bit SetForegroundWindow() replacement
-        RECT reWin;
-        GetWindowRect((HWND) m_winTop, &reWin);
-        SetWindowPos ((HWND) m_winTop, HWND_TOP,
-                             reWin.left, reWin.top, 
-                             reWin.right - reWin.left, reWin.bottom, 
-                             SWP_SHOWWINDOW);
-    }
-#endif
-#endif // MSW
 }
 
 // Yield to other apps/messages and disable user input to all windows except