minor fix to find contents file alright

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

diff --git a/src/msw/radiobut.cpp b/src/msw/radiobut.cpp
index ee28cf78d7e1504f02898964de4cb63052084e69..8f7c9786be2ab5a08a7f3651f034b5492bd902d0 100644 (file)
--- a/src/msw/radiobut.cpp
+++ b/src/msw/radiobut.cpp
@@ -24,6 +24,7 @@
 #include <stdio.h>
 #include "wx/setup.h"
 #include "wx/radiobut.h"
 #include <stdio.h>
 #include "wx/setup.h"
 #include "wx/radiobut.h"

+#include "wx/brush.h"

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


@@ -89,13 +90,13 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
     msStyle |= WS_BORDER;
 */
 
     msStyle |= WS_BORDER;
 */
 

-  m_hWnd = (WXHWND) CreateWindowEx(exStyle, RADIO_CLASS, (const char *)label,
+  m_hWnd = (WXHWND) CreateWindowEx(exStyle, RADIO_CLASS, (const wxChar *)label,

                           msStyle,0,0,0,0,
                           (HWND) parent->GetHWND(), (HMENU)m_windowId, wxGetInstance(), NULL);
 
                           msStyle,0,0,0,0,
                           (HWND) parent->GetHWND(), (HMENU)m_windowId, wxGetInstance(), NULL);
 

-  wxCHECK_MSG( m_hWnd, FALSE, "Failed to create radiobutton" );
+  wxCHECK_MSG( m_hWnd, FALSE, _T("Failed to create radiobutton") );

 
 

-#if CTL3D
+#if wxUSE_CTL3D

   if (want3D)
   {
     Ctl3dSubclassCtl((HWND) m_hWnd);
   if (want3D)
   {
     Ctl3dSubclassCtl((HWND) m_hWnd);


@@ -111,10 +112,10 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
 //  SetValue(value);
 
   // start GRW fix
 //  SetValue(value);
 
   // start GRW fix

-  if (label != "")
+  if (label != _T(""))

   {
     int label_width, label_height;
   {
     int label_width, label_height;

-    GetTextExtent(label, &label_width, &label_height, NULL, NULL, & GetFont());
+    GetTextExtent(label, &label_width, &label_height, NULL, NULL, & this->GetFont());

     if (width < 0)
       width = (int)(label_width + RADIO_SIZE);
     if (height<0)
     if (width < 0)
       width = (int)(label_width + RADIO_SIZE);
     if (height<0)


@@ -141,7 +142,7 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
 
 void wxRadioButton::SetLabel(const wxString& label)
 {
 
 void wxRadioButton::SetLabel(const wxString& label)
 {

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

 }
 
 void wxRadioButton::SetValue(bool value)
 }
 
 void wxRadioButton::SetValue(bool value)


@@ -159,7 +160,7 @@ bool wxRadioButton::GetValue(void) const
 WXHBRUSH wxRadioButton::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
       WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {
 WXHBRUSH wxRadioButton::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
       WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {

-#if CTL3D
+#if wxUSE_CTL3D

   if ( m_useCtl3D )
   {
     HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
   if ( m_useCtl3D )
   {
     HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);


@@ -230,7 +231,7 @@ bool wxBitmapRadioButton::Create(wxWindow *parent, wxWindowID id,
 
   wxCHECK_MSG( m_hWnd, "Failed to create radio button", FALSE );
 
 
   wxCHECK_MSG( m_hWnd, "Failed to create radio button", FALSE );
 

-#if CTL3D
+#if wxUSE_CTL3D

   if (!(GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS))
   {
     Ctl3dSubclassCtl((HWND) GetHWND());
   if (!(GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS))
   {
     Ctl3dSubclassCtl((HWND) GetHWND());