X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce3ed50dbe32d118321082db84c3a9abb047d5b7..e66474166b164b9e11f9881e79d531bc5182ea31:/src/msw/checkbox.cpp

diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp
index 1461cf6f4f..89f0c52cca 100644
--- a/src/msw/checkbox.cpp
+++ b/src/msw/checkbox.cpp
@@ -58,8 +58,8 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
   m_windowStyle = style;
 
   wxString Label = label;
-  if (Label == "")
-    Label = " "; // Apparently needed or checkbox won't show
+  if (Label == _T(""))
+    Label = _T(" "); // Apparently needed or checkbox won't show
 
 	if ( id == -1 )
   		m_windowId = NewControlId();
@@ -89,13 +89,13 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
     msStyle |= WS_BORDER;
 */
 
-  m_hWnd = (WXHWND)CreateWindowEx(exStyle, "BUTTON", Label,
+  m_hWnd = (WXHWND)CreateWindowEx(exStyle, _T("BUTTON"), Label,
                                   msStyle,
                                   0, 0, 0, 0,
                                   (HWND)parent->GetHWND(), (HMENU)m_windowId,
                                   wxGetInstance(), NULL);
 
-#if CTL3D
+#if wxUSE_CTL3D
   if (want3D)
   {
     Ctl3dSubclassCtl((HWND)m_hWnd);
@@ -118,7 +118,7 @@ void wxCheckBox::SetLabel(const wxString& label)
   SetWindowText((HWND)GetHWND(), label);
 }
 
-void wxCheckBox::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxCheckBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
   int currentX, currentY;
   GetPosition(&currentX, &currentY);
@@ -174,7 +174,7 @@ void wxCheckBox::SetValue(bool val)
 #define BST_CHECKED 0x0001
 #endif
 
-bool wxCheckBox::GetValue(void) const
+bool wxCheckBox::GetValue() const
 {
 #ifdef __WIN32__
   return (SendMessage((HWND) GetHWND(), BM_GETCHECK, 0, 0) == BST_CHECKED);
@@ -186,7 +186,7 @@ bool wxCheckBox::GetValue(void) const
 WXHBRUSH wxCheckBox::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);
@@ -245,12 +245,12 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l
   checkHeight = -1 ;
   long msStyle = CHECK_FLAGS;
 
-  HWND wx_button = CreateWindowEx(MakeExtendedStyle(m_windowStyle), CHECK_CLASS, "toggle",
+  HWND wx_button = CreateWindowEx(MakeExtendedStyle(m_windowStyle), CHECK_CLASS, _T("toggle"),
                     msStyle,
                     0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
                     wxGetInstance(), NULL);
 
-#if CTL3D
+#if wxUSE_CTL3D
   if (!(GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS))
   {
     Ctl3dSubclassCtl(wx_button);
@@ -271,11 +271,11 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l
   return TRUE;
 }
 
-void wxBitmapCheckBox::SetLabel(const wxBitmap *bitmap)
+void wxBitmapCheckBox::SetLabel(const wxBitmap& bitmap)
 {
 }
 
-void wxBitmapCheckBox::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxBitmapCheckBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
   int currentX, currentY;
   GetPosition(&currentX, &currentY);
@@ -307,7 +307,7 @@ void wxBitmapCheckBox::SetValue(bool val)
   SendMessage((HWND) GetHWND(), BM_SETCHECK, val, 0);
 }
 
-bool wxBitmapCheckBox::GetValue(void) const
+bool wxBitmapCheckBox::GetValue() const
 {
   return ((0x003 & SendMessage((HWND) GetHWND(), BM_GETCHECK, 0, 0)) == 0x003);
 }