Corrections to Forty Thieves; wxMemoryDC problem temporarily sorted

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

diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp
index 32b1b32e2c2163395355b1d91b585825701e75ea..33452a6cdd004a7857a132b820e0dea0a8b5748d 100644 (file)
--- a/src/msw/checkbox.cpp
+++ b/src/msw/checkbox.cpp
@@ -33,7 +33,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);


@@ -83,9 +83,10 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 
   // Even with extended styles, need to combine with WS_BORDER
   // for them to look right.
 
   // Even with extended styles, need to combine with WS_BORDER
   // for them to look right.

-  if (want3D && ((m_windowStyle & wxSIMPLE_BORDER) || (m_windowStyle & wxRAISED_BORDER) ||
-       (m_windowStyle & wxSUNKEN_BORDER) || (m_windowStyle & wxDOUBLE_BORDER)))
+/*
+  if ( want3D || wxStyleHasBorder(m_windowStyle) )

     msStyle |= WS_BORDER;
     msStyle |= WS_BORDER;

+*/

 
   m_hWnd = (WXHWND)CreateWindowEx(exStyle, "BUTTON", Label,
                                   msStyle,
 
   m_hWnd = (WXHWND)CreateWindowEx(exStyle, "BUTTON", Label,
                                   msStyle,


@@ -104,7 +105,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);
 


@@ -142,7 +143,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, & 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)