X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd3f686c274a264e89ea97505350a82c1134f307..5b077d483bcd47bcd1c3e89a9adc1d6b1a44e046:/include/wx/msw/control.h diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h index f6ab16ee18..df1b339b8c 100644 --- 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 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() @@ -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