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

Applied [ 700293 ] FL Unicode patches

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-04-02 14:14:13 +00:00
parent db657fb29a
commit 873a543b62
9 changed files with 152 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/include/wx/fl/controlbar.h
View File

@@ -239,7 +239,7 @@ public:
int alignment = FL_ALIGN_TOP,
int rowNo = 0,
int columnPos = 0,
const wxString& name="bar",
const wxString& name = wxT("bar"),
bool spyEvents = FALSE,
int state = wxCBAR_DOCKED_HORIZONTALLY
);

6
contrib/include/wx/fl/dyntbar.h
View File

@@ -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.

6
contrib/include/wx/fl/newbmpbtn.h
View File

@@ -110,7 +110,7 @@ public:
// Constructor.
wxNewBitmapButton( const wxBitmap& labelBitmap = wxNullBitmap,
const wxString& labelText = "",
const wxString& labelText = wxT(""),
int alignText = NB_ALIGN_TEXT_BOTTOM,
bool isFlat = TRUE,
// this is the default type of fired events
@@ -124,7 +124,7 @@ public:
// Use this constructor if buttons have to be persistant
wxNewBitmapButton( const wxString& bitmapFileName,
const wxBitmapType bitmapFileType = wxBITMAP_TYPE_BMP,
const wxString& labelText = "",
const wxString& labelText = wxT(""),
int alignText = NB_ALIGN_TEXT_BOTTOM,
bool isFlat = TRUE,
// this is the default type of fired events
@@ -143,7 +143,7 @@ public:
virtual void Reshape();
// Sets the label and optionally label text.
virtual void SetLabel(const wxBitmap& labelBitmap, const wxString& labelText = "" );
virtual void SetLabel(const wxBitmap& labelBitmap, const wxString& labelText = wxT("") );
// Sets the text alignment and margins.
virtual void SetAlignments( int alignText = NB_ALIGN_TEXT_BOTTOM,