Warning fixes and deprecated method elimination from ABX.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -156,6 +156,11 @@ public:
|
||||
const wxString& labelText = wxT(""), bool alignTextRight = FALSE,
|
||||
bool isFlat = TRUE );
|
||||
|
||||
// Unhide method from parent.
|
||||
|
||||
virtual wxToolBarToolBase *AddTool (wxToolBarToolBase *tool)
|
||||
{ return wxToolBarBase::AddTool(tool); };
|
||||
|
||||
// Method from wxToolBarBase (for compatibility), only
|
||||
// the first two arguments are valid.
|
||||
// See the documentation for wxToolBar for details.
|
||||
@@ -166,7 +171,12 @@ public:
|
||||
|
||||
// Adds a separator. See the documentation for wxToolBar for details.
|
||||
|
||||
virtual void AddSeparator( wxWindow* pSepartorWnd = NULL );
|
||||
virtual void AddSeparator( wxWindow* pSepartorWnd );
|
||||
FIXXXXXME
|
||||
// Unhide method from parent.
|
||||
|
||||
virtual wxToolBarToolBase *AddSeparator()
|
||||
{ return wxToolBarBase::AddSeparator(); };
|
||||
|
||||
// Returns tool information for the given tool index.
|
||||
|
||||
|
@@ -145,6 +145,11 @@ public:
|
||||
// Sets the label and optionally label text.
|
||||
virtual void SetLabel(const wxBitmap& labelBitmap, const wxString& labelText = wxT("") );
|
||||
|
||||
// Unhide method from parents.
|
||||
|
||||
virtual void SetLabel(const wxString& label)
|
||||
{ wxPanel::SetLabel(label); };
|
||||
|
||||
// Sets the text alignment and margins.
|
||||
virtual void SetAlignments( int alignText = NB_ALIGN_TEXT_BOTTOM,
|
||||
int marginX = NB_DEFAULT_MARGIN,
|
||||
|
Reference in New Issue
Block a user