X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..2004484f9b139978e86c3e9e102001a46f493576:/src/msw/control.cpp diff --git a/src/msw/control.cpp b/src/msw/control.cpp index 22090f64c0..6c1cbf8c8d 100644 --- a/src/msw/control.cpp +++ b/src/msw/control.cpp @@ -21,10 +21,13 @@ #endif #ifndef WX_PRECOMP +#include "wx/event.h" #include "wx/app.h" #include "wx/dcclient.h" #endif +#include "wx/control.h" + #include "wx/msw/private.h" #if defined(__WIN95__) && !defined(__GNUWIN32__) @@ -61,7 +64,7 @@ wxControl::~wxControl(void) wxWindow *parent = (wxWindow *)GetParent(); if (parent) { - if (parent->GetDefaultItem() == this) + if (parent->GetDefaultItem() == (wxButton*) this) parent->SetDefaultItem(NULL); } } @@ -74,9 +77,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); } @@ -182,7 +188,8 @@ long wxControl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM 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); @@ -232,18 +239,18 @@ bool wxControl::MSWNotify(WXWPARAM wParam, 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 }