Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unneeded overrides

Browse Source 
These just forward to the base class
This commit is contained in:
Paul Cornett
2019-04-05 10:54:54 -07:00
parent fe1737d399
commit 794c1374b8
12 changed files with 0 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/osx/checkbox.h
View File

@@ -72,7 +72,6 @@ public:
const wxString& name = wxCheckBoxNameStr); const wxString& name = wxCheckBoxNameStr);
virtual void SetValue(bool); virtual void SetValue(bool);
virtual bool GetValue() const; 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 wxBitmap *bitmap);
virtual void SetLabel( const wxString & WXUNUSED(name) ) {} virtual void SetLabel( const wxString & WXUNUSED(name) ) {}

2
include/wx/osx/listbox.h
View File

@@ -91,8 +91,6 @@ public:
virtual ~wxListBox(); virtual ~wxListBox();
// implement base class pure virtuals // implement base class pure virtuals
virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL) wxOVERRIDE;
virtual unsigned int GetCount() const wxOVERRIDE; virtual unsigned int GetCount() const wxOVERRIDE;
virtual wxString GetString(unsigned int n) const wxOVERRIDE; virtual wxString GetString(unsigned int n) const wxOVERRIDE;
virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE; virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE;

4
include/wx/osx/menu.h
View File

@@ -142,14 +142,10 @@ public:
} }
// implementation from now on // implementation from now on
void Detach();
// returns TRUE if we're attached to a frame // returns TRUE if we're attached to a frame
bool IsAttached() const { return m_menuBarFrame != NULL; } bool IsAttached() const { return m_menuBarFrame != NULL; }
// get the frame we live in // get the frame we live in
wxFrame *GetFrame() const { return m_menuBarFrame; } 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, // if the menubar is modified, the display is not updated automatically,
// call this function to update it (m_menuBarFrame should be !NULL) // call this function to update it (m_menuBarFrame should be !NULL)

3
include/wx/osx/radiobox.h
View File

@@ -74,9 +74,6 @@ public:
virtual wxString GetString(unsigned int item) const wxOVERRIDE; virtual wxString GetString(unsigned int item) const wxOVERRIDE;
virtual void SetString(unsigned int item, const wxString& label) 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 // protect native font of box
virtual bool SetFont( const wxFont &font ) wxOVERRIDE; virtual bool SetFont( const wxFont &font ) wxOVERRIDE;
// Other external functions // Other external functions

1
include/wx/osx/slider.h
View File

@@ -81,7 +81,6 @@ protected:
virtual wxSize DoGetBestSize() const wxOVERRIDE; virtual wxSize DoGetBestSize() const wxOVERRIDE;
virtual void DoSetSize(int x, int y, int w, int h, int sizeFlags) 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 // set min/max size of the slider
virtual void DoSetSizeHints( int minW, int minH, virtual void DoSetSizeHints( int minW, int minH,

1
include/wx/osx/textctrl.h
View File

@@ -99,7 +99,6 @@ public:
// -------------- // --------------
virtual void Command(wxCommandEvent& event) wxOVERRIDE; virtual void Command(wxCommandEvent& event) wxOVERRIDE;
virtual bool AcceptsFocus() const wxOVERRIDE;
virtual void SetWindowStyleFlag(long style) wxOVERRIDE; virtual void SetWindowStyleFlag(long style) wxOVERRIDE;
// callbacks // callbacks

5
src/osx/checkbox_osx.cpp
View File

@@ -171,11 +171,6 @@ void wxBitmapCheckBox::SetLabel(const wxBitmap *WXUNUSED(bitmap))
wxFAIL_MSG(wxT("wxBitmapCheckBox::SetLabel() not yet implemented")); 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)) void wxBitmapCheckBox::SetValue(bool WXUNUSED(val))
{ {
// TODO // TODO

5
src/osx/listbox_osx.cpp
View File

@@ -282,11 +282,6 @@ wxSize wxListBox::DoGetBestSize() const
return wxSize( lbWidth, lbHeight ); return wxSize( lbWidth, lbHeight );
} }
void wxListBox::Refresh(bool eraseBack, const wxRect *rect)
{
wxControl::Refresh( eraseBack, rect );
}
// Some custom controls depend on this // Some custom controls depend on this
/* static */ wxVisualAttributes /* static */ wxVisualAttributes
wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))

10
src/osx/menu_osx.cpp
View File

@@ -699,16 +699,6 @@ bool wxMenuBar::Append(wxMenu *menu, const wxString& title)
return true; return true;
} }
void wxMenuBar::Detach()
{
wxMenuBarBase::Detach() ;
}
void wxMenuBar::Attach(wxFrame *frame)
{
wxMenuBarBase::Attach( frame ) ;
}
void wxMenuBar::DoGetPosition(int *x, int *y) const void wxMenuBar::DoGetPosition(int *x, int *y) const
{ {
int _x,_y,_width,_height; int _x,_y,_width,_height;

14
src/osx/radiobox_osx.cpp
View File

@@ -193,13 +193,6 @@ bool wxRadioBox::IsItemEnabled(unsigned int item) const
return current->IsEnabled(); return current->IsEnabled();
} }
// Returns the radiobox label
//
wxString wxRadioBox::GetLabel() const
{
return wxControl::GetLabel();
}
// Returns the label for the given button // Returns the label for the given button
// //
wxString wxRadioBox::GetString(unsigned int item) const wxString wxRadioBox::GetString(unsigned int item) const
@@ -238,13 +231,6 @@ int wxRadioBox::GetSelection() const
return i; return i;
} }
// Sets the radiobox label
//
void wxRadioBox::SetLabel(const wxString& label)
{
return wxControl::SetLabel( label );
}
// Sets the label of a given button // Sets the label of a given button
// //
void wxRadioBox::SetString(unsigned int item,const wxString& label) void wxRadioBox::SetString(unsigned int item,const wxString& label)

5
src/osx/slider_osx.cpp
View File

@@ -500,11 +500,6 @@ void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags)
m_minWidth = minWidth; 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 // Common processing to invert slider values based on wxSL_INVERSE
int wxSlider::ValueInvertOrNot(int value) const int wxSlider::ValueInvertOrNot(int value) const
{ {

6
src/osx/textctrl_osx.cpp
View File

@@ -186,12 +186,6 @@ bool wxTextCtrl::IsModified() const
return m_dirty; 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 wxSize wxTextCtrl::DoGetBestSize() const
{ {
int wText = -1; int wText = -1;