Added wxTE_PROCESS_TAB

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

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 22090f64c04280d15d1ba3c66b248b5d668eee09..6c1cbf8c8dcbd58c6093b9c5a0ed3615b5b9f056 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -21,10 +21,13 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+#include "wx/event.h"

 #include "wx/app.h"
 #include "wx/dcclient.h"
 #endif
 
 #include "wx/app.h"
 #include "wx/dcclient.h"
 #endif
 

+#include "wx/control.h"
+

 #include "wx/msw/private.h"
 
 #if defined(__WIN95__) && !defined(__GNUWIN32__)
 #include "wx/msw/private.h"
 
 #if defined(__WIN95__) && !defined(__GNUWIN32__)


@@ -61,7 +64,7 @@ wxControl::~wxControl(void)
   wxWindow *parent = (wxWindow *)GetParent();
   if (parent)
   {
   wxWindow *parent = (wxWindow *)GetParent();
   if (parent)
   {

-    if (parent->GetDefaultItem() == this)
+    if (parent->GetDefaultItem() == (wxButton*) this)

         parent->SetDefaultItem(NULL);
   }
 }
         parent->SetDefaultItem(NULL);
   }
 }


@@ -74,9 +77,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);
 }


@@ -182,7 +188,8 @@ long wxControl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
   return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
 }
 
   return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
 }
 

-bool wxControl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
+bool wxControl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam,
+                          WXLPARAM* WXUNUSED(result))

 {
 #if defined(__WIN95__)
        wxCommandEvent event(wxEVT_NULL, m_windowId);
 {
 #if defined(__WIN95__)
        wxCommandEvent event(wxEVT_NULL, m_windowId);


@@ -232,18 +239,18 @@ bool wxControl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
                        break;
                }
 */
                        break;
                }
 */

-               default :
+               default:

                        return FALSE;
                        return FALSE;

-                       break;

        }
        }

+

     event.SetEventType(eventType);
        event.SetEventObject(this);
 
     event.SetEventType(eventType);
        event.SetEventObject(this);
 

-       if ( !ProcessEvent(event) )
+       if ( !GetEventHandler()->ProcessEvent(event) )

                return FALSE;
        return TRUE;
                return FALSE;
        return TRUE;

-#else
-  return FALSE;
+#else   // !Win95
+    return FALSE;

 #endif
 }
 
 #endif
 }