More Motif stuff, minor stubs correction

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

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 08ddcbc1aa3b92dac2a53b65507e2a1687ca401a..76c80cad360f9ce630fc5ed18e52ce910b2121dc 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
 {
 
 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);
 }
 
   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 :-(
 {
 /*
   // 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();
 
   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)
 }
 
 long wxControl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)


@@ -180,11 +185,11 @@ long wxControl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
   return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
 }
 
   return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
 }
 

-bool wxControl::MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam)
+bool wxControl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)

 {
 #if defined(__WIN95__)
 {
 #if defined(__WIN95__)

-       wxCommandEvent event(0, m_windowId);
-       int eventType = 0;
+       wxCommandEvent event(wxEVT_NULL, m_windowId);
+       wxEventType eventType = wxEVT_NULL;

        NMHDR *hdr1 = (NMHDR*) lParam;
        switch ( hdr1->code )
        {
        NMHDR *hdr1 = (NMHDR*) lParam;
        switch ( hdr1->code )
        {


@@ -291,12 +296,12 @@ void wxControl::OnEraseBackground(wxEraseEvent& event)
   ::SetMapMode((HDC) event.GetDC()->GetHDC(), mode);
 }
 
   ::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);
 }
 
 {
   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;
 
 {
   int x, y, width, height, panel_width, panel_height, new_x, new_y;