X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..add28c55a04eb30080fc2ef9d3c5ddf66eab236a:/include/wx/msw/control.h diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h index 0d9f09d682..3738d445e0 100644 --- a/include/wx/msw/control.h +++ b/include/wx/msw/control.h @@ -5,12 +5,12 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __CONTROLH__ -#define __CONTROLH__ +#ifndef _WX_CONTROL_H_ +#define _WX_CONTROL_H_ #ifdef __GNUG__ #pragma interface "control.h" @@ -28,10 +28,12 @@ public: wxControl(void); ~wxControl(void); - virtual void Command(wxCommandEvent& WXUNUSED(event)) = 0; // Simulates an event + virtual void Command(wxCommandEvent& WXUNUSED(event)) {}; // Simulates an event virtual void ProcessCommand(wxCommandEvent& event); // Calls the callback and // appropriate event handlers virtual void SetClientSize(int width, int height); + virtual void SetClientSize(const wxSize& sz) { wxWindow::SetClientSize(sz); } + virtual void SetLabel(const wxString& label); virtual wxString GetLabel(void) const ; @@ -54,7 +56,7 @@ public: // Window procedure virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); virtual void MSWOnMouseMove(int x, int y, WXUINT flags); - virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam); + virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM *result); void OnEraseBackground(wxEraseEvent& event); @@ -83,4 +85,4 @@ inline void wxControl::SetButtonFont(const wxFont& font) { SetFont(font); } #endif #endif - // __CONTROLH__ + // _WX_CONTROL_H_