diff --git a/include/wx/osx/checkbox.h b/include/wx/osx/checkbox.h index c81865fbce..1c6c340595 100644 --- a/include/wx/osx/checkbox.h +++ b/include/wx/osx/checkbox.h @@ -72,7 +72,6 @@ public: const wxString& name = wxCheckBoxNameStr); virtual void SetValue(bool); virtual bool GetValue() const; - virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); virtual void SetLabel(const wxBitmap *bitmap); virtual void SetLabel( const wxString & WXUNUSED(name) ) {} diff --git a/include/wx/osx/listbox.h b/include/wx/osx/listbox.h index 2882c2eff9..3581f5611e 100644 --- a/include/wx/osx/listbox.h +++ b/include/wx/osx/listbox.h @@ -91,8 +91,6 @@ public: virtual ~wxListBox(); // implement base class pure virtuals - virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL) wxOVERRIDE; - virtual unsigned int GetCount() const wxOVERRIDE; virtual wxString GetString(unsigned int n) const wxOVERRIDE; virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE; diff --git a/include/wx/osx/menu.h b/include/wx/osx/menu.h index 2fee40e622..a9bd1a164e 100644 --- a/include/wx/osx/menu.h +++ b/include/wx/osx/menu.h @@ -142,14 +142,10 @@ public: } // implementation from now on - void Detach(); - // returns TRUE if we're attached to a frame bool IsAttached() const { return m_menuBarFrame != NULL; } // get the frame we live in wxFrame *GetFrame() const { return m_menuBarFrame; } - // attach to a frame - void Attach(wxFrame *frame); // if the menubar is modified, the display is not updated automatically, // call this function to update it (m_menuBarFrame should be !NULL) diff --git a/include/wx/osx/radiobox.h b/include/wx/osx/radiobox.h index 3b4aedb265..c147241dbe 100644 --- a/include/wx/osx/radiobox.h +++ b/include/wx/osx/radiobox.h @@ -74,9 +74,6 @@ public: virtual wxString GetString(unsigned int item) const wxOVERRIDE; virtual void SetString(unsigned int item, const wxString& label) wxOVERRIDE; - virtual wxString GetLabel() const wxOVERRIDE; - virtual void SetLabel(const wxString& label) wxOVERRIDE; - // protect native font of box virtual bool SetFont( const wxFont &font ) wxOVERRIDE; // Other external functions diff --git a/include/wx/osx/slider.h b/include/wx/osx/slider.h index fffde4d3ee..848da62e72 100644 --- a/include/wx/osx/slider.h +++ b/include/wx/osx/slider.h @@ -81,7 +81,6 @@ protected: virtual wxSize DoGetBestSize() const wxOVERRIDE; virtual void DoSetSize(int x, int y, int w, int h, int sizeFlags) wxOVERRIDE; - virtual void DoMoveWindow(int x, int y, int w, int h) wxOVERRIDE; // set min/max size of the slider virtual void DoSetSizeHints( int minW, int minH, diff --git a/include/wx/osx/textctrl.h b/include/wx/osx/textctrl.h index 2512c753fb..96ee937dc1 100644 --- a/include/wx/osx/textctrl.h +++ b/include/wx/osx/textctrl.h @@ -99,7 +99,6 @@ public: // -------------- virtual void Command(wxCommandEvent& event) wxOVERRIDE; - virtual bool AcceptsFocus() const wxOVERRIDE; virtual void SetWindowStyleFlag(long style) wxOVERRIDE; // callbacks diff --git a/src/osx/checkbox_osx.cpp b/src/osx/checkbox_osx.cpp index 9c3e975694..73d53f0892 100644 --- a/src/osx/checkbox_osx.cpp +++ b/src/osx/checkbox_osx.cpp @@ -171,11 +171,6 @@ void wxBitmapCheckBox::SetLabel(const wxBitmap *WXUNUSED(bitmap)) wxFAIL_MSG(wxT("wxBitmapCheckBox::SetLabel() not yet implemented")); } -void wxBitmapCheckBox::SetSize(int x, int y, int width, int height, int sizeFlags) -{ - wxControl::SetSize( x , y , width , height , sizeFlags ) ; -} - void wxBitmapCheckBox::SetValue(bool WXUNUSED(val)) { // TODO diff --git a/src/osx/listbox_osx.cpp b/src/osx/listbox_osx.cpp index adc62f2ffd..e97d1b6c88 100644 --- a/src/osx/listbox_osx.cpp +++ b/src/osx/listbox_osx.cpp @@ -282,11 +282,6 @@ wxSize wxListBox::DoGetBestSize() const return wxSize( lbWidth, lbHeight ); } -void wxListBox::Refresh(bool eraseBack, const wxRect *rect) -{ - wxControl::Refresh( eraseBack, rect ); -} - // Some custom controls depend on this /* static */ wxVisualAttributes wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) diff --git a/src/osx/menu_osx.cpp b/src/osx/menu_osx.cpp index 02b1e8e16a..60b3e466a3 100644 --- a/src/osx/menu_osx.cpp +++ b/src/osx/menu_osx.cpp @@ -699,16 +699,6 @@ bool wxMenuBar::Append(wxMenu *menu, const wxString& title) return true; } -void wxMenuBar::Detach() -{ - wxMenuBarBase::Detach() ; -} - -void wxMenuBar::Attach(wxFrame *frame) -{ - wxMenuBarBase::Attach( frame ) ; -} - void wxMenuBar::DoGetPosition(int *x, int *y) const { int _x,_y,_width,_height; diff --git a/src/osx/radiobox_osx.cpp b/src/osx/radiobox_osx.cpp index fa98137a27..50dbb33b2f 100644 --- a/src/osx/radiobox_osx.cpp +++ b/src/osx/radiobox_osx.cpp @@ -193,13 +193,6 @@ bool wxRadioBox::IsItemEnabled(unsigned int item) const return current->IsEnabled(); } -// Returns the radiobox label -// -wxString wxRadioBox::GetLabel() const -{ - return wxControl::GetLabel(); -} - // Returns the label for the given button // wxString wxRadioBox::GetString(unsigned int item) const @@ -238,13 +231,6 @@ int wxRadioBox::GetSelection() const return i; } -// Sets the radiobox label -// -void wxRadioBox::SetLabel(const wxString& label) -{ - return wxControl::SetLabel( label ); -} - // Sets the label of a given button // void wxRadioBox::SetString(unsigned int item,const wxString& label) diff --git a/src/osx/slider_osx.cpp b/src/osx/slider_osx.cpp index 275e8a254d..517d8c1780 100644 --- a/src/osx/slider_osx.cpp +++ b/src/osx/slider_osx.cpp @@ -500,11 +500,6 @@ void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags) m_minWidth = minWidth; } -void wxSlider::DoMoveWindow(int x, int y, int width, int height) -{ - wxControl::DoMoveWindow( x, y, width, height ); -} - // Common processing to invert slider values based on wxSL_INVERSE int wxSlider::ValueInvertOrNot(int value) const { diff --git a/src/osx/textctrl_osx.cpp b/src/osx/textctrl_osx.cpp index 1ef8afa420..2eeea31854 100644 --- a/src/osx/textctrl_osx.cpp +++ b/src/osx/textctrl_osx.cpp @@ -186,12 +186,6 @@ bool wxTextCtrl::IsModified() const return m_dirty; } -bool wxTextCtrl::AcceptsFocus() const -{ - // we don't want focus if we can't be edited - return /*IsEditable() && */ wxControl::AcceptsFocus(); -} - wxSize wxTextCtrl::DoGetBestSize() const { int wText = -1;