From bbd230a11d23790d4e11fb088419cb21b0eafa18 Mon Sep 17 00:00:00 2001
From: Robert Roebling <robert@roebling.de>
Date: Sat, 9 Nov 2002 13:51:26 +0000
Subject: [PATCH]   Unicode compile fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/generic/fontdlgg.cpp | 6 +++---
 src/generic/mdig.cpp     | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp
index 359424e7ec..1971e40551 100644
--- a/src/generic/fontdlgg.cpp
+++ b/src/generic/fontdlgg.cpp
@@ -77,7 +77,7 @@ void wxFontPreviewer::OnPaint(wxPaintEvent& WXUNUSED(event))
         dc.SetFont(GetFont());
         // Calculate vertical centre
         long w, h;
-        dc.GetTextExtent("X", &w, &h);
+        dc.GetTextExtent( wxT("X"), &w, &h);
         dc.SetTextForeground(GetForegroundColour());
         dc.SetClippingRegion(2, 2, size.x-4, size.y-4);
         dc.DrawText(_("ABCDEFGabcdefg12345"), 
@@ -237,8 +237,8 @@ void wxGenericFontDialog::CreateWidgets()
   int i;
   for ( i = 0; i < 40; i++)
   {
-    char buf[5];
-    sprintf(buf, "%d", i + 1);
+    wxChar buf[5];
+    wxSprintf(buf, wxT("%d"), i + 1);
     pointSizes[i] = buf;
   }
 
diff --git a/src/generic/mdig.cpp b/src/generic/mdig.cpp
index 9a9f7bd64f..ea08482ba2 100644
--- a/src/generic/mdig.cpp
+++ b/src/generic/mdig.cpp
@@ -34,8 +34,6 @@
     #include "wx/intl.h"
 #endif //WX_PRECOMP
 
-#define _(x) wxT(x)
-
 #include "wx/generic/mdig.h"
 
 enum MDI_MENU_ID
@@ -457,7 +455,7 @@ bool wxGenericMDIChildFrame::Create( wxGenericMDIParentFrame *parent,
 {
     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);