Applied [ 700293 ] FL Unicode patches
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -148,12 +148,12 @@ public:
|
||||
virtual void AddTool( int toolIndex,
|
||||
const wxString& imageFileName,
|
||||
wxBitmapType imageFileType = wxBITMAP_TYPE_BMP,
|
||||
const wxString& labelText = "", bool alignTextRight = FALSE,
|
||||
const wxString& labelText = wxT(""), bool alignTextRight = FALSE,
|
||||
bool isFlat = TRUE );
|
||||
// Adds a tool. See the documentation for wxToolBar for details.
|
||||
|
||||
virtual void AddTool( int toolIndex, wxBitmap labelBmp,
|
||||
const wxString& labelText = "", bool alignTextRight = FALSE,
|
||||
const wxString& labelText = wxT(""), bool alignTextRight = FALSE,
|
||||
bool isFlat = TRUE );
|
||||
|
||||
// Method from wxToolBarBase (for compatibility), only
|
||||
@@ -162,7 +162,7 @@ public:
|
||||
|
||||
virtual wxToolBarToolBase *AddTool(const int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap,
|
||||
const bool toggle = FALSE, const long xPos = -1, const long yPos = -1, wxObject *clientData = NULL,
|
||||
const wxString& helpString1 = "", const wxString& helpString2 = "");
|
||||
const wxString& helpString1 = wxT(""), const wxString& helpString2 = wxT(""));
|
||||
|
||||
// Adds a separator. See the documentation for wxToolBar for details.
|
||||
|
||||
|
Reference in New Issue
Block a user