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

Unicode compile fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-11-09 13:51:26 +00:00
parent 9064852f8e
commit bbd230a11d
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/generic/fontdlgg.cpp
View File

@@ -77,7 +77,7 @@ void wxFontPreviewer::OnPaint(wxPaintEvent& WXUNUSED(event))
dc.SetFont(GetFont()); dc.SetFont(GetFont());
// Calculate vertical centre // Calculate vertical centre
long w, h; long w, h;
dc.GetTextExtent("X", &w, &h); dc.GetTextExtent( wxT("X"), &w, &h);
dc.SetTextForeground(GetForegroundColour()); dc.SetTextForeground(GetForegroundColour());
dc.SetClippingRegion(2, 2, size.x-4, size.y-4); dc.SetClippingRegion(2, 2, size.x-4, size.y-4);
dc.DrawText(_("ABCDEFGabcdefg12345"), dc.DrawText(_("ABCDEFGabcdefg12345"),
@@ -237,8 +237,8 @@ void wxGenericFontDialog::CreateWidgets()
int i; int i;
for ( i = 0; i < 40; i++) for ( i = 0; i < 40; i++)
{ {
char buf[5]; wxChar buf[5];
sprintf(buf, "%d", i + 1); wxSprintf(buf, wxT("%d"), i + 1);
pointSizes[i] = buf; pointSizes[i] = buf;
} }

4
src/generic/mdig.cpp
View File

@@ -34,8 +34,6 @@
#include "wx/intl.h" #include "wx/intl.h"
#endif //WX_PRECOMP #endif //WX_PRECOMP
#define _(x) wxT(x)
#include "wx/generic/mdig.h" #include "wx/generic/mdig.h"
enum MDI_MENU_ID enum MDI_MENU_ID
@@ -457,7 +455,7 @@ bool wxGenericMDIChildFrame::Create( wxGenericMDIParentFrame *parent,
{ {
wxGenericMDIClientWindow* pClientWindow = parent->GetClientWindow(); wxGenericMDIClientWindow* pClientWindow = parent->GetClientWindow();
wxASSERT_MSG((pClientWindow != (wxWindow*) NULL), "Missing MDI client window."); wxASSERT_MSG((pClientWindow != (wxWindow*) NULL), wxT("Missing MDI client window.") );
wxPanel::Create(pClientWindow, id, wxDefaultPosition, size, style, name); wxPanel::Create(pClientWindow, id, wxDefaultPosition, size, style, name);