X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbcdf8bc7ca806d8278c7cb6d09d5590378b67d8..5b077d483bcd47bcd1c3e89a9adc1d6b1a44e046:/include/wx/msw/control.h

diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index 495799bf32..df1b339b8c 100644
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/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 ;
 
@@ -41,8 +43,8 @@ public:
 
    inline virtual void SetLabelFont(const wxFont& font);
    inline virtual void SetButtonFont(const wxFont& font);
-   inline wxFont  *GetLabelFont(void) const ;
-   inline wxFont  *GetButtonFont(void) const ;
+   inline wxFont& GetLabelFont(void) const ;
+   inline wxFont& GetButtonFont(void) const ;
 #endif
 
    // Places item in centre of panel - so can't be used BEFORE panel->Fit()
@@ -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);
 
@@ -76,8 +78,8 @@ DECLARE_EVENT_TABLE()
 inline void wxControl::Callback(const wxFunction function) { m_callback = function; };           // Adds callback
 
 #if WXWIN_COMPATIBILITY
-inline wxFont  *wxControl::GetLabelFont(void) const         { return GetFont() ; }
-inline wxFont  *wxControl::GetButtonFont(void) const        { return GetFont() ; }
+inline wxFont& wxControl::GetLabelFont(void) const         { return GetFont() ; }
+inline wxFont& wxControl::GetButtonFont(void) const        { return GetFont() ; }
 inline void wxControl::SetLabelFont(const wxFont& font) { SetFont(font); }
 inline void wxControl::SetButtonFont(const wxFont& font) { SetFont(font); }
 #endif