AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats 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,

2
contrib/src/fl/bardragpl.cpp
View File

@ -669,7 +669,7 @@ void cbBarDragPlugin::OnLButtonDown( cbLeftDownEvent& event )
{
if ( mBarDragStarted )
{
wxMessageBox("DblClick!");
wxMessageBox(wxT("DblClick!"));
}
event.Skip();

6
contrib/src/fl/cbcustom.cpp
View File

@ -97,8 +97,8 @@ void cbSimpleCustomizationPlugin::OnCustomizeBar( cbCustomizeBarEvent& event )
void cbSimpleCustomizationPlugin::OnCustomizeLayout( cbCustomizeLayoutEvent& event )
{
wxString helpStr1 = "Select this item to show the corresponding control bar";
wxString helpStr2 = "Select this itme to hide the corresponding control bar";
wxString helpStr1 = wxT("Select this item to show the corresponding control bar");
wxString helpStr2 = wxT("Select this itme to hide the corresponding control bar");
int id = CB_CUSTOMIZE_MENU_FIRST_ITEM_ID;
@ -153,7 +153,7 @@ void cbSimpleCustomizationPlugin::OnMenuItemSelected( wxCommandEvent& event )
{
if ( event.GetId() == mCustMenuItemId )
{
wxMessageBox("Customization dialog box is not supported by this plugin yet");
wxMessageBox(wxT("Customization dialog box is not supported by this plugin yet"));
return;
}

8
contrib/src/fl/controlbar.cpp
View File

@ -977,7 +977,7 @@ void wxFrameLayout::RemoveBar( cbBarInfo* pBarInfo )
return;
}
}
wxFAIL_MSG("bar info should be present in the list of all bars of all panes");
wxFAIL_MSG(wxT("bar info should be present in the list of all bars of all panes"));
}
bool wxFrameLayout::LocateBar( cbBarInfo* pBarInfo,
@ -1484,7 +1484,7 @@ void wxFrameLayout::OnIdle( wxIdleEvent& event )
if ( !focus && mCheckFocusWhenIdle )
{
wxMessageBox( "Hi, no more focus in this app!" );
wxMessageBox(wxT("Hi, no more focus in this app!"));
mCheckFocusWhenIdle = FALSE;
//ShowFloatedWindows( FALSE );
@ -3016,7 +3016,7 @@ int cbDockPane::GetRowIndex( cbRowInfo* pRow )
return i;
}
wxFAIL_MSG("Row must be present to call cbDockPane::GetRowIndex()");
wxFAIL_MSG(wxT("Row must be present to call cbDockPane::GetRowIndex()"));
return 0;
}
@ -3064,7 +3064,7 @@ bool cbDockPane::MatchesMask( int paneMask )
case FL_ALIGN_RIGHT : thisMask = FL_ALIGN_RIGHT_PANE; break;
default:
wxFAIL_MSG("Bad FL alignment type detected in cbDockPane::MatchesMask()");
wxFAIL_MSG(wxT("Bad FL alignment type detected in cbDockPane::MatchesMask()"));
}
return ( thisMask & paneMask ) != 0;

134
contrib/src/fl/flVC.dsp
View File

@ -5,7 +5,7 @@
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=flVC - Win32 Release DLL
CFG=flVC - Win32 Debug Unicode DLL
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@ -14,7 +14,7 @@ CFG=flVC - Win32 Release DLL
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "flVC.mak" CFG="flVC - Win32 Release DLL"
!MESSAGE NMAKE /f "flVC.mak" CFG="flVC - Win32 Debug Unicode DLL"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@ -22,6 +22,10 @@ CFG=flVC - Win32 Release DLL
!MESSAGE "flVC - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "flVC - Win32 Debug DLL" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "flVC - Win32 Release DLL" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "flVC - Win32 Release Unicode" (based on "Win32 (x86) Static Library")
!MESSAGE "flVC - Win32 Release Unicode DLL" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "flVC - Win32 Debug Unicode" (based on "Win32 (x86) Static Library")
!MESSAGE "flVC - Win32 Debug Unicode DLL" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@ -149,6 +153,128 @@ LINK32=link.exe
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw250.lib /nologo /version:1.0 /dll /machine:IX86 /out:"../../../lib/fldll.dll" /libpath:"../../../lib"
# SUBTRACT LINK32 /pdb:none /incremental:no /debug
!ELSEIF "$(CFG)" == "flVC - Win32 Release Unicode"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "flVC___Win32_Release_Unicode"
# PROP BASE Intermediate_Dir "flVC___Win32_Release_Unicode"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "flVC___Win32_Release_Unicode"
# PROP Intermediate_Dir "flVC___Win32_Release_Unicode"
# PROP Target_Dir ""
LINK32=link.exe
CPP=cl.exe
# ADD BASE CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/msw" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__HACK_MY_MSDEV40__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/msw" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__HACK_MY_MSDEV40__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "UNICODE" /D "_UNICODE" /YX /FD /c
RSC=rc.exe
# ADD BASE RSC /l 0x809
# ADD RSC /l 0x809
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\..\lib\fl.lib"
# ADD LIB32 /nologo /out:"..\..\..\lib\flu.lib"
!ELSEIF "$(CFG)" == "flVC - Win32 Release Unicode DLL"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "flVC___Win32_Release_Unicode_DLL"
# PROP BASE Intermediate_Dir "flVC___Win32_Release_Unicode_DLL"
# PROP BASE Ignore_Export_Lib 0
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "flVC___Win32_Release_Unicode_DLL"
# PROP Intermediate_Dir "flVC___Win32_Release_Unicode_DLL"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\..\lib\fld.lib"
# ADD LIB32 /nologo /out:"..\..\..\lib\fld.lib"
CPP=cl.exe
# ADD BASE CPP /nologo /MD /W3 /GX /Zi /O2 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/mswdlld" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXMAKING_FL_DLL" /YX /FD /c
# SUBTRACT BASE CPP /u
# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/mswdlld" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXMAKING_FL_DLL" /D "_UNICODE" /D "UNICODE" /YX /FD /c
# SUBTRACT CPP /u
MTL=midl.exe
RSC=rc.exe
# ADD BASE RSC /l 0x809
# ADD RSC /l 0x809
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw250.lib /nologo /version:1.0 /dll /machine:IX86 /out:"../../../lib/fldll.dll" /libpath:"../../../lib"
# SUBTRACT BASE LINK32 /pdb:none /incremental:no /debug
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw250.lib /nologo /version:1.0 /dll /machine:IX86 /out:"../../../lib/fldllu.dll" /libpath:"../../../lib"
# SUBTRACT LINK32 /pdb:none /incremental:no /debug
!ELSEIF "$(CFG)" == "flVC - Win32 Debug Unicode"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "flVC___Win32_Debug_Unicode"
# PROP BASE Intermediate_Dir "flVC___Win32_Debug_Unicode"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "flVC___Win32_Debug_Unicode"
# PROP Intermediate_Dir "flVC___Win32_Debug_Unicode"
# PROP Target_Dir ""
LINK32=link.exe
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswd" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /c
# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswd" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "UNICODE" /D "_UNICODE" /YX /FD /c
RSC=rc.exe
# ADD BASE RSC /l 0x809
# ADD RSC /l 0x809
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\..\lib\fld.lib"
# ADD LIB32 /nologo /out:"..\..\..\lib\flud.lib"
!ELSEIF "$(CFG)" == "flVC - Win32 Debug Unicode DLL"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "flVC___Win32_Debug_Unicode_DLL"
# PROP BASE Intermediate_Dir "flVC___Win32_Debug_Unicode_DLL"
# PROP BASE Ignore_Export_Lib 0
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "flVC___Win32_Debug_Unicode_DLL"
# PROP Intermediate_Dir "flVC___Win32_Debug_Unicode_DLL"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\..\..\lib\fld.lib"
# ADD LIB32 /nologo /out:"..\..\..\lib\fld.lib"
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswdlld" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXMAKING_FL_DLL" /YX /FD /c
# SUBTRACT BASE CPP /u
# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswdlld" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXMAKING_FL_DLL" /D "UNICODE" /D "_UNICODE" /YX /FD /c
# SUBTRACT CPP /u
MTL=midl.exe
RSC=rc.exe
# ADD BASE RSC /l 0x809
# ADD RSC /l 0x809
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw250d.lib /nologo /version:1.0 /dll /debug /machine:IX86 /out:"../../../lib/fldlld.dll" /libpath:"../../../lib"
# SUBTRACT BASE LINK32 /pdb:none
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw250d.lib /nologo /version:1.0 /dll /debug /machine:IX86 /out:"../../../lib/fldllud.dll" /libpath:"../../../lib"
# SUBTRACT LINK32 /pdb:none
!ENDIF
# Begin Target
@ -157,6 +283,10 @@ LINK32=link.exe
# Name "flVC - Win32 Debug"
# Name "flVC - Win32 Debug DLL"
# Name "flVC - Win32 Release DLL"
# Name "flVC - Win32 Release Unicode"
# Name "flVC - Win32 Release Unicode DLL"
# Name "flVC - Win32 Debug Unicode"
# Name "flVC - Win32 Debug Unicode DLL"
# Begin Group "Headers"
# PROP Default_Filter ""

6
contrib/src/fl/newbmpbtn.cpp
View File

@ -433,7 +433,7 @@ void wxNewBitmapButton::RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp,
}
else
{
wxFAIL_MSG("Unsupported FL alignment type detected in wxNewBitmapButton::RenderLabelImage()");
wxFAIL_MSG(wxT("Unsupported FL alignment type detected in wxNewBitmapButton::RenderLabelImage()"));
}
}
else
@ -731,7 +731,7 @@ void wxNewBitmapButton::Reshape( )
// in the case of loading button from stream, check if we
// have non-empty image-file name, load if possible
if ( mImageFileName != "" )
if ( mImageFileName != wxT("") )
{
mDepressedBmp.LoadFile( mImageFileName, mImageFileType );
@ -796,6 +796,6 @@ void wxNewBitmapButton::OnKillFocus( wxFocusEvent& event )
{
// useless
wxMessageBox("kill-focus for button!");
wxMessageBox(wxT("kill-focus for button!"));
}

4
contrib/src/fl/toolwnd.cpp
View File

@ -81,7 +81,7 @@ wxToolWindow::wxToolWindow()
mTitleFont( 8, wxSWISS, wxNORMAL, wxNORMAL ),
#else
// just to simulate MS-Dev style
mTitleFont( 8, wxSWISS, wxNORMAL, wxNORMAL, FALSE, "MS Sans Serif" ),
mTitleFont( 8, wxSWISS, wxNORMAL, wxNORMAL, FALSE, wxT("MS Sans Serif") ),
#endif
mTitleHeight ( 16 ),
@ -572,7 +572,7 @@ void wxToolWindow::OnMotion( wxMouseEvent& event )
DrawHintRect( mPrevHintRect );
DrawHintRect( finalRect );
::wxLogTrace("%d,%d / %d,%d\n", finalRect.x, finalRect.y, finalRect.width, finalRect.height);
::wxLogTrace(wxT("%d,%d / %d,%d\n"), finalRect.x, finalRect.y, finalRect.width, finalRect.height);
}
mPrevHintRect = finalRect;