Had missed one LPSTR.

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

diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp
index 7cc14b9f10e2e0ea1f8ffdb34f21cc51e6eee462..89f0c52cca36848e9b2b288210c7cad89d26187b 100644 (file)
--- a/src/msw/checkbox.cpp
+++ b/src/msw/checkbox.cpp
@@ -22,6 +22,7 @@
 
 #ifndef WX_PRECOMP
 #include "wx/checkbox.h"
 
 #ifndef WX_PRECOMP
 #include "wx/checkbox.h"

+#include "wx/brush.h"

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


@@ -33,7 +34,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
 
 bool wxCheckBox::MSWCommand(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id))
 {
 
 bool wxCheckBox::MSWCommand(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id))
 {

-  wxCommandEvent event(wxEVENT_TYPE_CHECKBOX_COMMAND, m_windowId);
+  wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId);

   event.SetInt(GetValue());
   event.SetEventObject(this);
   ProcessCommand(event);
   event.SetInt(GetValue());
   event.SetEventObject(this);
   ProcessCommand(event);


@@ -57,8 +58,8 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
   m_windowStyle = style;
 
   wxString Label = 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();
 
        if ( id == -1 )
                m_windowId = NewControlId();


@@ -88,13 +89,13 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
     msStyle |= WS_BORDER;
 */
 
     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);
 
                                   msStyle,
                                   0, 0, 0, 0,
                                   (HWND)parent->GetHWND(), (HMENU)m_windowId,
                                   wxGetInstance(), NULL);
 

-#if CTL3D
+#if wxUSE_CTL3D

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


@@ -105,7 +106,7 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
   // Subclass again for purposes of dialog editing mode
   SubclassWin(m_hWnd);
   
   // Subclass again for purposes of dialog editing mode
   SubclassWin(m_hWnd);
   

-  SetFont(*parent->GetFont());
+  SetFont(parent->GetFont());

 
   SetSize(x, y, width, height);
 
 
   SetSize(x, y, width, height);
 


@@ -117,7 +118,7 @@ void wxCheckBox::SetLabel(const wxString& label)
   SetWindowText((HWND)GetHWND(), 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);
 {
   int currentX, currentY;
   GetPosition(&currentX, &currentY);


@@ -143,7 +144,7 @@ void wxCheckBox::SetSize(int x, int y, int width, int height, int sizeFlags)
 
   if ( !str.IsEmpty() )
   {
 
   if ( !str.IsEmpty() )
   {

-    GetTextExtent(str, &current_width, &cyf, NULL, NULL, GetFont());
+    GetTextExtent(str, &current_width, &cyf, NULL, NULL, & this->GetFont());

     if (w1 < 0)
       w1 = (int)(current_width + RADIO_SIZE);
     if (h1 < 0)
     if (w1 < 0)
       w1 = (int)(current_width + RADIO_SIZE);
     if (h1 < 0)


@@ -169,7 +170,11 @@ void wxCheckBox::SetValue(bool val)
   SendMessage((HWND) GetHWND(), BM_SETCHECK, val, 0);
 }
 
   SendMessage((HWND) GetHWND(), BM_SETCHECK, val, 0);
 }
 

-bool wxCheckBox::GetValue(void) const
+#ifndef BST_CHECKED
+#define BST_CHECKED 0x0001
+#endif
+
+bool wxCheckBox::GetValue() const

 {
 #ifdef __WIN32__
   return (SendMessage((HWND) GetHWND(), BM_GETCHECK, 0, 0) == BST_CHECKED);
 {
 #ifdef __WIN32__
   return (SendMessage((HWND) GetHWND(), BM_GETCHECK, 0, 0) == BST_CHECKED);


@@ -181,7 +186,7 @@ bool wxCheckBox::GetValue(void) const
 WXHBRUSH wxCheckBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
                        WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {
 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);
   if ( m_useCtl3D )
   {
     HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);


@@ -240,12 +245,12 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l
   checkHeight = -1 ;
   long msStyle = CHECK_FLAGS;
 
   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);
 
                     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);
   if (!(GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS))
   {
     Ctl3dSubclassCtl(wx_button);


@@ -266,11 +271,11 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l
   return TRUE;
 }
 
   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);
 {
   int currentX, currentY;
   GetPosition(&currentX, &currentY);


@@ -302,7 +307,7 @@ void wxBitmapCheckBox::SetValue(bool val)
   SendMessage((HWND) GetHWND(), BM_SETCHECK, val, 0);
 }
 
   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);
 }
 {
   return ((0x003 & SendMessage((HWND) GetHWND(), BM_GETCHECK, 0, 0)) == 0x003);
 }