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

Unicode fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2005-04-27 01:12:00 +00:00
parent a8e120ce46
commit edf1dfa16d
9 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/os2/bmpbuttn.h
View File

@@ -15,7 +15,7 @@
#include "wx/button.h"
#include "wx/dcclient.h"
WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
#define wxDEFAULT_BUTTON_MARGIN 4

2
include/wx/os2/dialog.h
View File

@@ -14,7 +14,7 @@
#include "wx/panel.h"
WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
class WXDLLEXPORT wxDialogModalData;

2
include/wx/os2/helpwin.h
View File

@@ -30,7 +30,7 @@ class WXDLLEXPORT wxWinHelpController: public wxHelpControllerBase
virtual bool Initialize(const wxString& file);
// If file is "", reloads file given in Initialize
virtual bool LoadFile(const wxString& file = "");
virtual bool LoadFile(const wxString& file = wxEmptyString);
virtual bool DisplayContents();
virtual bool DisplaySection(int sectionNo);
virtual bool DisplayBlock(long blockNo);

4
include/wx/os2/menuitem.h
View File

@@ -47,8 +47,8 @@ public:
//
wxMenuItem( wxMenu* pParentMenu = NULL
,int nId = wxID_SEPARATOR
,const wxString& rStrName = ""
,const wxString& rWxHelp = ""
,const wxString& rStrName = wxEmptyString
,const wxString& rWxHelp = wxEmptyString
,wxItemKind eKind = wxITEM_NORMAL
,wxMenu* pSubMenu = NULL
);

4
include/wx/os2/metafile.h
View File

@@ -57,7 +57,7 @@ class WXDLLEXPORT wxMetafile: public wxGDIObject
inline wxMetafile(const wxMetafile& metafile)
{ Ref(metafile); }
wxMetafile(const wxString& file = "");
wxMetafile(const wxString& file = wxEmptyString);
~wxMetafile(void);
// After this is called, the metafile cannot be used for anything
@@ -91,7 +91,7 @@ class WXDLLEXPORT wxMetafileDC: public wxDC
public:
// Don't supply origin and extent
// Supply them to wxMakeMetaFilePlaceable instead.
wxMetafileDC(const wxString& file = "");
wxMetafileDC(const wxString& file = wxEmptyString);
// Supply origin and extent (recommended).
// Then don't need to supply them to wxMakeMetaFilePlaceable.

2
include/wx/os2/private.h
View File

@@ -303,7 +303,7 @@ WXDLLEXPORT wxFont wxCreateFontFromLogFont( LOGFONT* pLogFont
,PFONTMETRICS pFM
,PFACENAMEDESC pFace
);
WXDLLEXPORT int wxGpiStrcmp(char* s0, char* s1);
WXDLLEXPORT int wxGpiStrcmp(wxChar* s0, wxChar* s1);
WXDLLEXPORT void wxSliderEvent(WXHWND control, WXWORD wParam, WXWORD pos);
WXDLLEXPORT void wxScrollBarEvent(WXHWND hbar, WXWORD wParam, WXWORD pos);

4
include/wx/os2/spinbutt.h
View File

@@ -32,7 +32,7 @@ public:
,const wxPoint& rPos = wxDefaultPosition
,const wxSize& rSize = wxDefaultSize
,long lStyle = wxSP_VERTICAL
,const wxString& rsName = "wxSpinButton"
,const wxString& rsName = wxT("wxSpinButton")
)
{
Create(pParent, vId, rPos, rSize, lStyle, rsName);
@@ -45,7 +45,7 @@ public:
,const wxPoint& rPos = wxDefaultPosition
,const wxSize& rSize = wxDefaultSize
,long lStyle = wxSP_VERTICAL
,const wxString& rsName = "wxSpinButton"
,const wxString& rsName = wxT("wxSpinButton")
);
// Accessors

4
include/wx/os2/tabctrl.h
View File

@@ -34,7 +34,7 @@ class WXDLLEXPORT wxTabCtrl: public wxControl
wxTabCtrl();
inline wxTabCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
long style = 0, const wxString& name = "tabCtrl")
long style = 0, const wxString& name = wxT("tabCtrl"))
{
Create(parent, id, pos, size, style, name);
}
@@ -93,7 +93,7 @@ class WXDLLEXPORT wxTabCtrl: public wxControl
// Operations
bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
long style = 0, const wxString& name = "tabCtrl");
long style = 0, const wxString& name = wxT("tabCtrl"));
// Delete all items
bool DeleteAllItems();

2
include/wx/os2/window.h
View File

@@ -234,7 +234,7 @@ public:
// returns true if the window has been created
bool OS2Create( PSZ zClass
,const char* zTitle
,const wxChar* zTitle
,WXDWORD dwStyle
,const wxPoint& rPos
,const wxSize& rSize