conversions from int/long to wxString won't compile any more

[wxWidgets.git] / include / wx / msw / control.h

diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h
index 7516125e92f04c012f95df61c3c349abfdd96e6f..df1b339b8cf0fefc28725586c46f62378bf55769 100644 (file)
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -32,6 +32,8 @@ public:
    virtual void ProcessCommand(wxCommandEvent& event); // Calls the callback and
                                                                  // appropriate event handlers
    virtual void SetClientSize(int width, int height);
    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 ;
 
    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 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()
 #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);
    // 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);
 
 
    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 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
 inline void wxControl::SetLabelFont(const wxFont& font) { SetFont(font); }
 inline void wxControl::SetButtonFont(const wxFont& font) { SetFont(font); }
 #endif