Try to find comctl32.dll version even if we don't have shlwapi.h available,

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

diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp
index 89f0c52cca36848e9b2b288210c7cad89d26187b..3955dba0642fbd6d5884d4719ccf8207a120b291 100644 (file)
--- a/src/msw/checkbox.cpp
+++ b/src/msw/checkbox.cpp
@@ -1,315 +1,239 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        checkbox.cpp
+// Name:        msw/checkbox.cpp

 // Purpose:     wxCheckBox
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Purpose:     wxCheckBox
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "checkbox.h"
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma implementation "checkbox.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_CHECKBOX
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/checkbox.h"
-#include "wx/brush.h"
+    #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"
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
+#ifndef BST_UNCHECKED
+    #define BST_UNCHECKED 0x0000

 #endif
 
 #endif
 

-bool wxCheckBox::MSWCommand(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id))
-{
-  wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId);
-  event.SetInt(GetValue());
-  event.SetEventObject(this);
-  ProcessCommand(event);
-  return TRUE;
-}
+#ifndef BST_CHECKED
+    #define BST_CHECKED 0x0001
+#endif

 
 

-// 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)
-{
-  SetName(name);
-  SetValidator(validator);
-  if (parent) parent->AddChild(this);
-
-  SetBackgroundColour(parent->GetBackgroundColour()) ;
-  SetForegroundColour(parent->GetForegroundColour()) ;
-
-  m_windowStyle = style;
-
-  wxString Label = label;
-  if (Label == _T(""))
-    Label = _T(" "); // Apparently needed or checkbox won't show
-
-       if ( id == -1 )
-               m_windowId = NewControlId();
-       else
-               m_windowId = id;
-
-  int x = pos.x;
-  int y = pos.y;
-  int width = size.x;
-  int height = size.y;
-
-  long msStyle = BS_AUTOCHECKBOX | WS_TABSTOP | WS_CHILD | WS_VISIBLE;
-  if ( style & wxALIGN_RIGHT )
-    msStyle |= BS_LEFTTEXT;
-
-  // 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
-  // in the style.
-  bool want3D;
-  WXDWORD exStyle = Determine3DEffects(0, &want3D) ;
-
-  // Even with extended styles, need to combine with WS_BORDER
-  // for them to look right.
-/*
-  if ( want3D || wxStyleHasBorder(m_windowStyle) )
-    msStyle |= WS_BORDER;
-*/
-
-  m_hWnd = (WXHWND)CreateWindowEx(exStyle, _T("BUTTON"), Label,
-                                  msStyle,
-                                  0, 0, 0, 0,
-                                  (HWND)parent->GetHWND(), (HMENU)m_windowId,
-                                  wxGetInstance(), NULL);
-
-#if wxUSE_CTL3D
-  if (want3D)
-  {
-    Ctl3dSubclassCtl((HWND)m_hWnd);
-    m_useCtl3D = TRUE;
-  }
+#ifndef BST_INDETERMINATE
+    #define BST_INDETERMINATE 0x0002

 #endif
 
 #endif
 

-  // Subclass again for purposes of dialog editing mode
-  SubclassWin(m_hWnd);
-  
-  SetFont(parent->GetFont());
+// ============================================================================
+// implementation
+// ============================================================================
+
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxCheckBoxStyle )
+
+wxBEGIN_FLAGS( wxCheckBoxStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxNO_BORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+wxEND_FLAGS( wxCheckBoxStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxCheckBox, wxControl,"wx/checkbox.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxCheckBox)
+    wxEVENT_PROPERTY( Click , wxEVT_COMMAND_CHECKBOX_CLICKED , wxCommandEvent )
+
+    wxPROPERTY( Font , wxFont , SetFont , GetFont , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Value ,bool, SetValue, GetValue, EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_FLAGS( WindowStyle , wxCheckBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxCheckBox)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_6( wxCheckBox , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle )
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
+#endif

 
 

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

 
 

-  return TRUE;
-}
+// ----------------------------------------------------------------------------
+// wxCheckBox
+// ----------------------------------------------------------------------------

 
 

-void wxCheckBox::SetLabel(const wxString& label)
+bool wxCheckBox::MSWCommand(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id))

 {
 {

-  SetWindowText((HWND)GetHWND(), label);
-}
+    wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId);
+    wxCheckBoxState state = Get3StateValue();

 
 

-void wxCheckBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
-{
-  int currentX, currentY;
-  GetPosition(&currentX, &currentY);
-  int x1 = x;
-  int y1 = y;
-  int w1 = width;
-  int h1 = height;
-
-  if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    x1 = currentX;
-  if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    y1 = currentY;
-
-  AdjustForParentClientOrigin(x1, y1, sizeFlags);
-
-  int current_width, cyf;
-  HWND button = (HWND) GetHWND();
-
-  int nLen = GetWindowTextLength(button);
-  wxString str;
-  GetWindowText(button, str.GetWriteBuf(nLen), nLen);
-  str.UngetWriteBuf();
-
-  if ( !str.IsEmpty() )
-  {
-    GetTextExtent(str, &current_width, &cyf, NULL, NULL, & this->GetFont());
-    if (w1 < 0)
-      w1 = (int)(current_width + RADIO_SIZE);
-    if (h1 < 0)
+    // If the style flag to allow the user setting the undetermined state
+    // is not set, then skip the undetermined state and set it to unchecked.
+    if ( state == wxCHK_UNDETERMINED && !Is3rdStateAllowedForUser() )

     {
     {

-      h1 = (int)(cyf);
-      if (h1 < RADIO_SIZE)
-        h1 = RADIO_SIZE;
+        state = wxCHK_UNCHECKED;
+        Set3StateValue(state);

     }
     }

-  }
-  else
-  {
-    if (w1 < 0)
-      w1 = RADIO_SIZE;
-    if (h1 < 0)
-      h1 = RADIO_SIZE;
-  }
-
-  MoveWindow(button, x1, y1, w1, h1, TRUE);
-}

 
 

-void wxCheckBox::SetValue(bool val)
-{
-  SendMessage((HWND) GetHWND(), BM_SETCHECK, val, 0);
-}
-
-#ifndef BST_CHECKED
-#define BST_CHECKED 0x0001
-#endif
+    event.SetInt(state);
+    event.SetEventObject(this);
+    ProcessCommand(event);

 
 

-bool wxCheckBox::GetValue() const
-{
-#ifdef __WIN32__
-  return (SendMessage((HWND) GetHWND(), BM_GETCHECK, 0, 0) == BST_CHECKED);
-#else
-  return ((0x003 & SendMessage((HWND) GetHWND(), BM_GETCHECK, 0, 0)) == 0x003);
-#endif
+    return true;

 }
 
 }
 

-WXHBRUSH wxCheckBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-                       WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+bool wxCheckBox::Create(wxWindow *parent,
+                        wxWindowID id,
+                        const wxString& label,
+                        const wxPoint& pos,
+                        const wxSize& size, long style,
+                        const wxValidator& validator,
+                        const wxString& name)

 {
 {

-#if wxUSE_CTL3D
-  if ( m_useCtl3D )
-  {
-    HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
-      
-      return (WXHBRUSH) hbrush;
-  }
-#endif
+    if ( !CreateControl(parent, id, pos, size, style, validator, name) )
+        return false;

 
 

-  if (GetParent()->GetTransparentBackground())
-    SetBkMode((HDC) pDC, TRANSPARENT);
-  else
-    SetBkMode((HDC) pDC, OPAQUE);
+    long msStyle = WS_TABSTOP;

 
 

-  ::SetBkColor((HDC) pDC, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
-  ::SetTextColor((HDC) pDC, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue()));
+    if ( style & wxCHK_3STATE )
+    {
+        msStyle |= BS_AUTO3STATE;
+    }
+    else
+    {
+        wxASSERT_MSG( !Is3rdStateAllowedForUser(),
+            wxT("Using wxCH_ALLOW_3RD_STATE_FOR_USER")
+            wxT(" style flag for a 2-state checkbox is useless") );
+        msStyle |= BS_AUTOCHECKBOX;
+    }

 
 

-  wxBrush *backgroundBrush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID);
+    if ( style & wxALIGN_RIGHT )
+    {
+        msStyle |= BS_LEFTTEXT | BS_RIGHT;
+    }

 
 

-  // Note that this will be cleaned up in wxApp::OnIdle, if backgroundBrush
-  // has a zero usage count.
-//  backgroundBrush->RealizeResource();
-  return (WXHBRUSH) backgroundBrush->GetResourceHandle();
+    return MSWCreateControl(wxT("BUTTON"), msStyle, pos, size, label, 0);

 }
 
 }
 

-void wxCheckBox::Command (wxCommandEvent & event)
-{
-  SetValue ((event.GetInt() != 0));
-  ProcessCommand (event);
-}

 
 

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

 {
 {

-  SetName(name);
-  SetValidator(validator);
-  if (parent) parent->AddChild(this);
-
-  SetBackgroundColour(parent->GetBackgroundColour()) ;
-  SetForegroundColour(parent->GetForegroundColour()) ;
-  m_windowStyle = style;
-
-       if ( id == -1 )
-               m_windowId = NewControlId();
-       else
-               m_windowId = id;
-
-  int x = pos.x;
-  int y = pos.y;
-  int width = size.x;
-  int height = size.y;
-
-  checkWidth = -1 ;
-  checkHeight = -1 ;
-  long msStyle = CHECK_FLAGS;
-
-  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 wxUSE_CTL3D
-  if (!(GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS))
-  {
-    Ctl3dSubclassCtl(wx_button);
-         m_useCtl3D = TRUE;
-  }
-#endif
+    static int s_checkSize = 0;
+
+    if ( !s_checkSize )
+    {
+        wxScreenDC dc;
+        dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));

 
 

-  m_hWnd = (WXHWND)wx_button;
+        s_checkSize = dc.GetCharHeight();
+    }

 
 

-  // Subclass again for purposes of dialog editing mode
-  SubclassWin((WXHWND)wx_button);
+    wxString str = wxGetWindowText(GetHWND());

 
 

-//  SetFont(parent->GetFont());
+    int wCheckbox, hCheckbox;
+    if ( !str.IsEmpty() )
+    {
+        GetTextExtent(str, &wCheckbox, &hCheckbox);
+        wCheckbox += s_checkSize + GetCharWidth();

 
 

-  SetSize(x, y, width, height);
+        if ( hCheckbox < s_checkSize )
+            hCheckbox = s_checkSize;
+    }
+    else
+    {
+        wCheckbox = s_checkSize;
+        hCheckbox = s_checkSize;
+    }
+#ifdef __WXWINCE__
+    hCheckbox += 1;
+#endif

 
 

-  ShowWindow(wx_button, SW_SHOW);
-  return TRUE;
+    return wxSize(wCheckbox, hCheckbox);

 }
 
 }
 

-void wxBitmapCheckBox::SetLabel(const wxBitmap& bitmap)
+void wxCheckBox::SetValue(bool val)

 {
 {

+    Set3StateValue(val ? wxCHK_CHECKED : wxCHK_UNCHECKED);

 }
 
 }
 

-void wxBitmapCheckBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+bool wxCheckBox::GetValue() const

 {
 {

-  int currentX, currentY;
-  GetPosition(&currentX, &currentY);
-
-  int x1 = x;
-  int y1 = y;
-  int w1 = width;
-  int h1 = height;
-
-  if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    x1 = currentX;
-  if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    y1 = currentY;
-
-  AdjustForParentClientOrigin(x1, y1, sizeFlags);
-
-  HWND button = (HWND) GetHWND();
-/*
-    if (w1<0)
-      w1 = checkWidth + FB_MARGIN ;
-    if (h1<0)
-      h1 = checkHeight + FB_MARGIN ;
-*/
-  MoveWindow(button, x1, y1, w1, h1, TRUE);
+    return Get3StateValue() != wxCHK_UNCHECKED;

 }
 
 }
 

-void wxBitmapCheckBox::SetValue(bool val)
+void wxCheckBox::Command(wxCommandEvent& event)

 {
 {

-  SendMessage((HWND) GetHWND(), BM_SETCHECK, val, 0);
+    int state = event.GetInt();
+    wxCHECK_RET( (state == wxCHK_UNCHECKED) || (state == wxCHK_CHECKED)
+        || (state == wxCHK_UNDETERMINED),
+        wxT("event.GetInt() returned an invalid checkbox state") );
+
+    Set3StateValue((wxCheckBoxState) state);
+    ProcessCommand(event);

 }
 
 }
 

-bool wxBitmapCheckBox::GetValue() const
+wxCOMPILE_TIME_ASSERT(wxCHK_UNCHECKED == BST_UNCHECKED
+    && wxCHK_CHECKED == BST_CHECKED
+    && wxCHK_UNDETERMINED == BST_INDETERMINATE, EnumValuesIncorrect);
+
+void wxCheckBox::DoSet3StateValue(wxCheckBoxState state)

 {
 {

-  return ((0x003 & SendMessage((HWND) GetHWND(), BM_GETCHECK, 0, 0)) == 0x003);
+    ::SendMessage(GetHwnd(), BM_SETCHECK, (WPARAM) state, 0);

 }
 
 }
 

+wxCheckBoxState wxCheckBox::DoGet3StateValue() const
+{
+    return (wxCheckBoxState) ::SendMessage(GetHwnd(), BM_GETCHECK, 0, 0);
+}

 
 

+#endif // wxUSE_CHECKBOX