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

fixed all the other ports broken by controls labels in wxToolBar patch commit

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-03-18 23:57:20 +00:00
parent 2a015b8917
commit 07d02e9ee0
13 changed files with 46 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/cocoa/toolbar.h
View File

@@ -103,7 +103,8 @@ protected:
wxObject *clientData, wxObject *clientData,
const wxString& shortHelpString, const wxString& shortHelpString,
const wxString& longHelpString); const wxString& longHelpString);
virtual wxToolBarToolBase *CreateTool(wxControl *control); virtual wxToolBarToolBase *CreateTool(wxControl *control,
const wxString& label);
wxSize m_bestSize; wxSize m_bestSize;
wxFrame *m_owningFrame; wxFrame *m_owningFrame;

9
include/wx/gtk/tbargtk.h
View File

@@ -54,10 +54,10 @@ public:
virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap); virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap);
virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap); virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap);
static wxVisualAttributes static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
// implementation from now on // implementation from now on
// -------------------------- // --------------------------
@@ -75,7 +75,7 @@ protected:
void GtkSetStyle(); void GtkSetStyle();
virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
// implement base class pure virtuals // implement base class pure virtuals
virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool); virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool); virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
@@ -92,7 +92,8 @@ protected:
wxObject *clientData, wxObject *clientData,
const wxString& shortHelpString, const wxString& shortHelpString,
const wxString& longHelpString); const wxString& longHelpString);
virtual wxToolBarToolBase *CreateTool(wxControl *control); virtual wxToolBarToolBase *CreateTool(wxControl *control,
const wxString& label);
private: private:
DECLARE_DYNAMIC_CLASS(wxToolBar) DECLARE_DYNAMIC_CLASS(wxToolBar)

3
include/wx/gtk1/tbargtk.h
View File

@@ -87,7 +87,8 @@ protected:
wxObject *clientData, wxObject *clientData,
const wxString& shortHelpString, const wxString& shortHelpString,
const wxString& longHelpString); const wxString& longHelpString);
virtual wxToolBarToolBase *CreateTool(wxControl *control); virtual wxToolBarToolBase *CreateTool(wxControl *control,
const wxString& label);
private: private:
DECLARE_DYNAMIC_CLASS(wxToolBar) DECLARE_DYNAMIC_CLASS(wxToolBar)

3
include/wx/motif/toolbar.h
View File

@@ -69,7 +69,8 @@ private:
wxObject *clientData, wxObject *clientData,
const wxString& shortHelp, const wxString& shortHelp,
const wxString& longHelp); const wxString& longHelp);
virtual wxToolBarToolBase *CreateTool(wxControl *control); virtual wxToolBarToolBase *CreateTool(wxControl *control,
const wxString& label);
virtual void DoSetSize(int x, int y, virtual void DoSetSize(int x, int y,
int width, int height, int width, int height,

3
include/wx/msw/wince/tbarwce.h
View File

@@ -63,7 +63,8 @@ protected:
wxObject *clientData, wxObject *clientData,
const wxString& shortHelp, const wxString& shortHelp,
const wxString& longHelp); const wxString& longHelp);
virtual wxToolBarToolBase *CreateTool(wxControl *control); virtual wxToolBarToolBase *CreateTool(wxControl *control,
const wxString& label);
private: private:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()

3
include/wx/os2/toolbar.h
View File

@@ -165,7 +165,8 @@ protected:
,const wxString& rsShortHelp ,const wxString& rsShortHelp
,const wxString& rsLongHelp ,const wxString& rsLongHelp
); );
virtual wxToolBarToolBase* CreateTool(wxControl* pControl); virtual wxToolBarToolBase* CreateTool(wxControl* pControl,
const wxString& label);
// //
// Helpers // Helpers

3
include/wx/palmos/toolbar.h
View File

@@ -83,7 +83,8 @@ protected:
wxObject *clientData, wxObject *clientData,
const wxString& shortHelp, const wxString& shortHelp,
const wxString& longHelp); const wxString& longHelp);
virtual wxToolBarToolBase *CreateTool(wxControl *control); virtual wxToolBarToolBase *CreateTool(wxControl *control,
const wxString& label);
// return the appropriate size and flags for the toolbar control // return the appropriate size and flags for the toolbar control
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const;

9
src/cocoa/toolbar.mm
View File

@@ -60,8 +60,8 @@ public:
CreateButtonCell(); CreateButtonCell();
} }
wxToolBarTool(wxToolBar *tbar, wxControl *control) wxToolBarTool(wxToolBar *tbar, wxControl *control, const wxString& label)
: wxToolBarToolBase(tbar, control) : wxToolBarToolBase(tbar, control, label)
{ {
Init(); Init();
} }
@@ -208,9 +208,10 @@ wxToolBarToolBase *wxToolBar::CreateTool(int toolid,
clientData, shortHelpString, longHelpString); clientData, shortHelpString, longHelpString);
} }
wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control) wxToolBarToolBase *
wxToolBar::CreateTool(wxControl *control, const wxString& label)
{ {
return new wxToolBarTool(this, control); return new wxToolBarTool(this, control, label);
} }
void wxToolBar::SetWindowStyleFlag( long style ) void wxToolBar::SetWindowStyleFlag( long style )

9
src/gtk/tbargtk.cpp
View File

@@ -91,8 +91,8 @@ public:
Init(); Init();
} }
wxToolBarTool(wxToolBar *tbar, wxControl *control) wxToolBarTool(wxToolBar *tbar, wxControl *control, const wxString& label)
: wxToolBarToolBase(tbar, control) : wxToolBarToolBase(tbar, control, label)
{ {
Init(); Init();
} }
@@ -269,9 +269,10 @@ wxToolBarToolBase *wxToolBar::CreateTool(int id,
clientData, shortHelpString, longHelpString); clientData, shortHelpString, longHelpString);
} }
wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control) wxToolBarToolBase *
wxToolBar::CreateTool(wxControl *control, const wxString& label)
{ {
return new wxToolBarTool(this, control); return new wxToolBarTool(this, control, label);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

9
src/gtk1/tbargtk.cpp
View File

@@ -88,8 +88,8 @@ public:
Init(); Init();
} }
wxToolBarTool(wxToolBar *tbar, wxControl *control) wxToolBarTool(wxToolBar *tbar, wxControl *control, const wxString& label)
: wxToolBarToolBase(tbar, control) : wxToolBarToolBase(tbar, control, label)
{ {
Init(); Init();
} }
@@ -246,9 +246,10 @@ wxToolBarToolBase *wxToolBar::CreateTool(int id,
clientData, shortHelpString, longHelpString); clientData, shortHelpString, longHelpString);
} }
wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control) wxToolBarToolBase *
wxToolBar::CreateTool(wxControl *control, const wxString& label)
{ {
return new wxToolBarTool(this, control); return new wxToolBarTool(this, control, label);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

9
src/motif/toolbar.cpp
View File

@@ -97,8 +97,8 @@ public:
Init(); Init();
} }
wxToolBarTool(wxToolBar *tbar, wxControl *control) wxToolBarTool(wxToolBar *tbar, wxControl *control, const wxString& label)
: wxToolBarToolBase(tbar, control) : wxToolBarToolBase(tbar, control, label)
{ {
Init(); Init();
} }
@@ -159,9 +159,10 @@ wxToolBarToolBase *wxToolBar::CreateTool(int id,
} }
wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control) wxToolBarToolBase *
wxToolBar::CreateTool(wxControl *control, const wxString& label)
{ {
return new wxToolBarTool(this, control); return new wxToolBarTool(this, control, label);
} }
void wxToolBarTool::Init() void wxToolBarTool::Init()

4
src/os2/toolbar.cpp
View File

@@ -60,8 +60,10 @@ public:
inline wxToolBarTool( wxToolBar* pTbar inline wxToolBarTool( wxToolBar* pTbar
,wxControl* pControl ,wxControl* pControl
,const wxString& label
) : wxToolBarToolBase( pTbar ) : wxToolBarToolBase( pTbar
,pControl ,pControl
,label
) )
{ {
} }
@@ -128,10 +130,12 @@ wxToolBarToolBase* wxToolBar::CreateTool(
wxToolBarToolBase *wxToolBar::CreateTool( wxToolBarToolBase *wxToolBar::CreateTool(
wxControl* pControl wxControl* pControl
, const wxString& label
) )
{ {
return new wxToolBarTool( this return new wxToolBarTool( this
,pControl ,pControl
,label
); );
} // end of wxToolBarSimple::CreateTool } // end of wxToolBarSimple::CreateTool

9
src/palmos/toolbar.cpp
View File

@@ -112,8 +112,8 @@ public:
{ {
} }
wxToolBarTool(wxToolBar *tbar, wxControl *control) wxToolBarTool(wxToolBar *tbar, wxControl *control, const wxString& label)
: wxToolBarToolBase(tbar, control) : wxToolBarToolBase(tbar, control, label)
{ {
} }
@@ -154,9 +154,10 @@ wxToolBarToolBase *wxToolBar::CreateTool(int id,
clientData, shortHelp, longHelp); clientData, shortHelp, longHelp);
} }
wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control) wxToolBarToolBase *
wxToolBar::CreateTool(wxControl *control, const wxString& label)
{ {
return new wxToolBarTool(this, control); return new wxToolBarTool(this, control, label);
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------