Don't send a focus event if the window is a wxTextCtrl, since it sends

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

diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp
index fec4da27fc483f84635236f73d01c6417960e8df..86211b4fcd15873ab3b1e5f39ddd4a6248a6fa5a 100644 (file)
--- a/src/msw/checkbox.cpp
+++ b/src/msw/checkbox.cpp
@@ -28,9 +28,13 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_CHECKBOX
+

 #ifndef WX_PRECOMP
     #include "wx/checkbox.h"
     #include "wx/brush.h"
 #ifndef WX_PRECOMP
     #include "wx/checkbox.h"
     #include "wx/brush.h"

+    #include "wx/dcscreen.h"
+    #include "wx/settings.h"

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


@@ -39,8 +43,8 @@
 // macros
 // ----------------------------------------------------------------------------
 
 // macros
 // ----------------------------------------------------------------------------
 

-    IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
-    IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
+IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -60,14 +64,18 @@ bool wxCheckBox::MSWCommand(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id))
 }
 
 // Single check box item
 }
 
 // Single check box item

-bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
-           const wxPoint& pos,
-           const wxSize& size, long style,
-           const wxValidator& validator,
-           const wxString& name)
+bool wxCheckBox::Create(wxWindow *parent,
+                        wxWindowID id,
+                        const wxString& label,
+                        const wxPoint& pos,
+                        const wxSize& size, long style,
+                        const wxValidator& validator,
+                        const wxString& name)

 {
     SetName(name);
 {
     SetName(name);

+#if wxUSE_VALIDATORS

     SetValidator(validator);
     SetValidator(validator);

+#endif // wxUSE_VALIDATORS

     if (parent) parent->AddChild(this);
 
     SetBackgroundColour(parent->GetBackgroundColour()) ;
     if (parent) parent->AddChild(this);
 
     SetBackgroundColour(parent->GetBackgroundColour()) ;


@@ -75,9 +83,14 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 
     m_windowStyle = style;
 
 
     m_windowStyle = style;
 

+    // VZ: disabling this ugliness which completely breaks checkboxes in wxGrid
+    //     whoever did it, please tell me where and how does the checkbox fail
+    //     to appear
+#if 0

     wxString Label = label;
     if (Label == wxT(""))
         Label = wxT(" "); // Apparently needed or checkbox won't show
     wxString Label = label;
     if (Label == wxT(""))
         Label = wxT(" "); // Apparently needed or checkbox won't show

+#endif // 0

 
     if ( id == -1 )
         m_windowId = NewControlId();
 
     if ( id == -1 )
         m_windowId = NewControlId();


@@ -93,6 +106,9 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
     if ( style & wxALIGN_RIGHT )
         msStyle |= BS_LEFTTEXT;
 
     if ( style & wxALIGN_RIGHT )
         msStyle |= BS_LEFTTEXT;
 

+    if ( style & wxCLIP_SIBLINGS )
+        msStyle |= WS_CLIPSIBLINGS;
+

     // We perhaps have different concepts of 3D here - a 3D border,
     // versus a 3D button.
     // So we only wish to give a border if this is specified
     // We perhaps have different concepts of 3D here - a 3D border,
     // versus a 3D button.
     // So we only wish to give a border if this is specified


@@ -107,7 +123,7 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
        msStyle |= WS_BORDER;
      */
 
        msStyle |= WS_BORDER;
      */
 

-    m_hWnd = (WXHWND)CreateWindowEx(exStyle, wxT("BUTTON"), Label,
+    m_hWnd = (WXHWND)CreateWindowEx(exStyle, wxT("BUTTON"), label,

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


@@ -133,27 +149,36 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 
 void wxCheckBox::SetLabel(const wxString& label)
 {
 
 void wxCheckBox::SetLabel(const wxString& label)
 {

-  SetWindowText(GetHwnd(), label);
+    SetWindowText(GetHwnd(), label);

 }
 
 wxSize wxCheckBox::DoGetBestSize() const
 {
 }
 
 wxSize wxCheckBox::DoGetBestSize() const
 {

-    int wCheckbox, hCheckbox;
+    static int s_checkSize = 0;
+
+    if ( !s_checkSize )
+    {
+        wxScreenDC dc;
+        dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+
+        s_checkSize = (3*dc.GetCharHeight())/2;
+    }

 
     wxString str = wxGetWindowText(GetHWND());
 
 
     wxString str = wxGetWindowText(GetHWND());
 

+    int wCheckbox, hCheckbox;

     if ( !str.IsEmpty() )
     {
         GetTextExtent(str, &wCheckbox, &hCheckbox);
     if ( !str.IsEmpty() )
     {
         GetTextExtent(str, &wCheckbox, &hCheckbox);

-        wCheckbox += RADIO_SIZE;
+        wCheckbox += s_checkSize + GetCharWidth();

 
 

-        if ( hCheckbox < RADIO_SIZE )
-            hCheckbox = RADIO_SIZE;
+        if ( hCheckbox < s_checkSize )
+            hCheckbox = s_checkSize;

     }
     else
     {
     }
     else
     {

-        wCheckbox = RADIO_SIZE;
-        hCheckbox = RADIO_SIZE;
+        wCheckbox = s_checkSize;
+        hCheckbox = s_checkSize;

     }
 
     return wxSize(wCheckbox, hCheckbox);
     }
 
     return wxSize(wCheckbox, hCheckbox);


@@ -173,7 +198,7 @@ bool wxCheckBox::GetValue() const
 #ifdef __WIN32__
   return (SendMessage(GetHwnd(), BM_GETCHECK, 0, 0) == BST_CHECKED);
 #else
 #ifdef __WIN32__
   return (SendMessage(GetHwnd(), BM_GETCHECK, 0, 0) == BST_CHECKED);
 #else

-  return ((0x003 & SendMessage(GetHwnd(), BM_GETCHECK, 0, 0)) == 0x003);
+  return ((0x001 & SendMessage(GetHwnd(), BM_GETCHECK, 0, 0)) == 0x001);

 #endif
 }
 
 #endif
 }
 


@@ -187,14 +212,16 @@ void wxCheckBox::Command (wxCommandEvent & event)
 // wxBitmapCheckBox
 // ----------------------------------------------------------------------------
 
 // wxBitmapCheckBox
 // ----------------------------------------------------------------------------
 

-bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *label,
+bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *WXUNUSED(label),

            const wxPoint& pos,
            const wxSize& size, long style,
            const wxValidator& validator,
            const wxString& name)
 {
   SetName(name);
            const wxPoint& pos,
            const wxSize& size, long style,
            const wxValidator& validator,
            const wxString& name)
 {
   SetName(name);

+#if wxUSE_VALIDATORS

   SetValidator(validator);
   SetValidator(validator);

+#endif // wxUSE_VALIDATORS

   if (parent) parent->AddChild(this);
 
   SetBackgroundColour(parent->GetBackgroundColour()) ;
   if (parent) parent->AddChild(this);
 
   SetBackgroundColour(parent->GetBackgroundColour()) ;


@@ -240,7 +267,9 @@ 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& WXUNUSED(bitmap))

 {
     wxFAIL_MSG(wxT("not implemented"));
 }
 {
     wxFAIL_MSG(wxT("not implemented"));
 }

+
+#endif // wxUSE_CHECKBOX