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

Some Unicode changes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
1999-04-19 17:47:19 +00:00
parent 4875458c3e
commit 39ca6d790b
10 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/app.h
View File

@@ -79,7 +79,7 @@ class WXDLLEXPORT wxApp: public wxEvtHandler
inline bool GetExitOnFrameDelete() const { return m_exitOnFrameDelete; } inline bool GetExitOnFrameDelete() const { return m_exitOnFrameDelete; }
inline const wxString& GetAppName() const { inline const wxString& GetAppName() const {
if (m_appName != "") if (m_appName != _T(""))
return m_appName; return m_appName;
else return m_className; else return m_className;
} }

4
include/wx/msw/combobox.h
View File

@@ -20,8 +20,8 @@
#if wxUSE_COMBOBOX #if wxUSE_COMBOBOX
WXDLLEXPORT_DATA(extern const char*) wxComboBoxNameStr; WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr;
WXDLLEXPORT_DATA(extern const char*) wxEmptyString; WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
// Combobox item // Combobox item
class WXDLLEXPORT wxComboBox: public wxChoice class WXDLLEXPORT wxComboBox: public wxChoice

2
include/wx/msw/font.h
View File

@@ -44,7 +44,7 @@ protected:
#define M_FONTDATA ((wxFontRefData *)m_refData) #define M_FONTDATA ((wxFontRefData *)m_refData)
WXDLLEXPORT_DATA(extern const char*) wxEmptyString; WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
// Font // Font
class WXDLLEXPORT wxFont: public wxGDIObject class WXDLLEXPORT wxFont: public wxGDIObject

6
include/wx/msw/frame.h
View File

@@ -20,9 +20,9 @@
#include "wx/toolbar.h" #include "wx/toolbar.h"
#include "wx/msw/accel.h" #include "wx/msw/accel.h"
WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr; WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr; WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
WXDLLEXPORT_DATA(extern const char*) wxStatusLineNameStr; WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr;
class WXDLLEXPORT wxMenuBar; class WXDLLEXPORT wxMenuBar;
class WXDLLEXPORT wxStatusBar; class WXDLLEXPORT wxStatusBar;

2
include/wx/msw/listbox.h
View File

@@ -37,7 +37,7 @@ WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;
// forward decl for GetSelections() // forward decl for GetSelections()
class wxArrayInt; class wxArrayInt;
WXDLLEXPORT_DATA(extern const char*) wxEmptyString; WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
// List box item // List box item
class WXDLLEXPORT wxListBox : public wxControl class WXDLLEXPORT wxListBox : public wxControl

4
include/wx/msw/mdi.h
View File

@@ -18,8 +18,8 @@
#include "wx/frame.h" #include "wx/frame.h"
WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr; WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
WXDLLEXPORT_DATA(extern const char*) wxStatusLineNameStr; WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr;
class WXDLLEXPORT wxMDIClientWindow; class WXDLLEXPORT wxMDIClientWindow;
class WXDLLEXPORT wxMDIChildFrame; class WXDLLEXPORT wxMDIChildFrame;

4
include/wx/msw/menu.h
View File

@@ -24,7 +24,7 @@ class WXDLLEXPORT wxMenuBar;
class WXDLLEXPORT wxMenu; class WXDLLEXPORT wxMenu;
class WXDLLEXPORT wxFrame; class WXDLLEXPORT wxFrame;
WXDLLEXPORT_DATA(extern const char*) wxEmptyString; WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Menu // Menu
@@ -237,7 +237,7 @@ public:
// attach to a frame // attach to a frame
void Attach(wxFrame *frame) void Attach(wxFrame *frame)
{ {
wxASSERT_MSG( !m_menuBarFrame, "menubar already attached!" ); wxASSERT_MSG( !m_menuBarFrame, _T("menubar already attached!") );
m_menuBarFrame = frame; m_menuBarFrame = frame;
} }

2
include/wx/msw/tbar95.h
View File

@@ -19,7 +19,7 @@
#if wxUSE_BUTTONBAR && wxUSE_TOOLBAR #if wxUSE_BUTTONBAR && wxUSE_TOOLBAR
#include "wx/tbarbase.h" #include "wx/tbarbase.h"
WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr; WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
class WXDLLEXPORT wxToolBar95: public wxToolBarBase class WXDLLEXPORT wxToolBar95: public wxToolBarBase
{ {

4
include/wx/msw/textctrl.h
View File

@@ -31,8 +31,8 @@
#define wxUSE_RICHEDIT 0 #define wxUSE_RICHEDIT 0
#endif #endif
WXDLLEXPORT_DATA(extern const char*) wxTextCtrlNameStr; WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr;
WXDLLEXPORT_DATA(extern const char*) wxEmptyString; WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
// Single-line text item // Single-line text item
class WXDLLEXPORT wxTextCtrl : public wxControl class WXDLLEXPORT wxTextCtrl : public wxControl

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

@@ -78,7 +78,7 @@ class WXDLLEXPORT wxResourceTable;
class WXDLLEXPORT wxItemResource; class WXDLLEXPORT wxItemResource;
#endif #endif
WXDLLEXPORT_DATA(extern const char*) wxPanelNameStr; WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
WXDLLEXPORT_DATA(extern const wxSize) wxDefaultSize; WXDLLEXPORT_DATA(extern const wxSize) wxDefaultSize;
WXDLLEXPORT_DATA(extern const wxPoint) wxDefaultPosition; WXDLLEXPORT_DATA(extern const wxPoint) wxDefaultPosition;