Suppose I should trust the headers in BC++5.02 more than BC++4.52

[wxWidgets.git] / src / msw / statbox.cpp

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index a82450f6b3c0b857b9c50c4d2a6927c70fda68f9..6ca6074e54a9fdcdcc33e99a471fa941ec08b9e9 100644 (file)
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -20,13 +20,15 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

+#include "wx/window.h"
+#include "wx/msw/private.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/dcclient.h"

 #include "wx/app.h"
 #include "wx/app.h"

+#include "wx/dcclient.h"

 #endif
 
 #include "wx/statbox.h"
 #endif
 
 #include "wx/statbox.h"

-#include "wx/msw/private.h"

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)


@@ -73,7 +75,7 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
   WXDWORD exStyle = Determine3DEffects(0, &want3D) ;
 
   HWND wx_button =
   WXDWORD exStyle = Determine3DEffects(0, &want3D) ;
 
   HWND wx_button =

-    CreateWindowEx(exStyle, "BUTTON", (const char *)label, msStyle,
+    CreateWindowEx(exStyle, _T("BUTTON"), (const wxChar *)label, msStyle,

                     0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
                     wxGetInstance(), NULL);
 #if wxUSE_CTL3D
                     0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
                     wxGetInstance(), NULL);
 #if wxUSE_CTL3D


@@ -99,7 +101,7 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
 
 void wxStaticBox::SetLabel(const wxString& label)
 {
 
 void wxStaticBox::SetLabel(const wxString& label)
 {

-  SetWindowText((HWND)m_hWnd, (const char *)label);
+  SetWindowText((HWND)m_hWnd, (const wxChar *)label);

 }
 
 void wxStaticBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 }
 
 void wxStaticBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)