Remove unneeded overrides
These just forward to the base class
This commit is contained in:
@@ -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) ) {}
|
||||
|
||||
|
@@ -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;
|
||||
|
@@ -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)
|
||||
|
@@ -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
|
||||
|
@@ -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,
|
||||
|
@@ -99,7 +99,6 @@ public:
|
||||
// --------------
|
||||
virtual void Command(wxCommandEvent& event) wxOVERRIDE;
|
||||
|
||||
virtual bool AcceptsFocus() const wxOVERRIDE;
|
||||
virtual void SetWindowStyleFlag(long style) wxOVERRIDE;
|
||||
|
||||
// callbacks
|
||||
|
@@ -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
|
||||
|
@@ -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))
|
||||
|
@@ -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;
|
||||
|
@@ -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)
|
||||
|
@@ -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
|
||||
{
|
||||
|
@@ -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;
|
||||
|
Reference in New Issue
Block a user