Removed some unnecessary bitmaps; other minor changes

[wxWidgets.git] / src / msw / control.cpp

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 640aca75c7a51fb06bbf4efbaa25e76b9c22dfae..297d81e8fbf7cd02f57744fa5e39688186cd8147 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -74,9 +74,12 @@ void wxControl::SetLabel(const wxString& label)
 
 wxString wxControl::GetLabel(void) const
 {
-  wxBuffer[0] = 0;
-  if (GetHWND())
-    GetWindowText((HWND)GetHWND(), wxBuffer, 1000);
+    wxBuffer[0] = 0;
+    if (GetHWND())
+    {
+        int len = GetWindowText((HWND)GetHWND(), wxBuffer, 256);
+        wxBuffer[len] = 0;
+    }
 
   return wxString(wxBuffer);
 }
@@ -132,7 +135,7 @@ void wxConvertDialogToPixels(wxWindow *control, int *x, int *y)
 }
 */
 
-void wxControl::MSWOnMouseMove(const int x, const int y, const WXUINT flags)
+void wxControl::MSWOnMouseMove(int x, int y, WXUINT flags)
 {
 /*
   // Trouble with this is that it sets the cursor for controls too :-(
@@ -172,7 +175,9 @@ void wxControl::MSWOnMouseMove(const int x, const int y, const WXUINT flags)
 
   m_lastEvent = wxEVT_MOTION;
   m_lastXPos = event.GetX(); m_lastYPos = event.GetY();
-  GetEventHandler()->OldOnMouseEvent(event);
+
+  if (!GetEventHandler()->ProcessEvent(event))
+    Default();
 }
 
 long wxControl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
@@ -180,7 +185,8 @@ long wxControl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
   return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
 }
 
-bool wxControl::MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam)
+bool wxControl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam,
+                          WXLPARAM* WXUNUSED(result))
 {
 #if defined(__WIN95__)
        wxCommandEvent event(wxEVT_NULL, m_windowId);
@@ -230,18 +236,18 @@ bool wxControl::MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam)
                        break;
                }
 */
-               default :
+               default:
                        return FALSE;
-                       break;
        }
+
     event.SetEventType(eventType);
        event.SetEventObject(this);
 
-       if ( !ProcessEvent(event) )
+       if ( !GetEventHandler()->ProcessEvent(event) )
                return FALSE;
        return TRUE;
-#else
-  return FALSE;
+#else   // !Win95
+    return FALSE;
 #endif
 }
 
@@ -291,12 +297,12 @@ void wxControl::OnEraseBackground(wxEraseEvent& event)
   ::SetMapMode((HDC) event.GetDC()->GetHDC(), mode);
 }
 
-void wxControl::SetClientSize (const int width, const int height)
+void wxControl::SetClientSize (int width, int height)
 {
   SetSize (-1, -1, width, height);
 }
 
-void wxControl::Centre (const int direction)
+void wxControl::Centre (int direction)
 {
   int x, y, width, height, panel_width, panel_height, new_x, new_y;