compilation fix for non-threaded compilation (threads are still broken

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

diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp
index 1beb5c6d3531318d1dfbcad677dcef63d5a4411b..3e8f8041858fd1817ff6b6cf725c94adcad211c5 100644 (file)
--- a/src/msw/checkbox.cpp
+++ b/src/msw/checkbox.cpp
@@ -6,203 +6,179 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

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

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "checkbox.h"
+    #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
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/checkbox.h"
+    #include "wx/checkbox.h"
+    #include "wx/brush.h"

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

-#if !USE_SHARED_LIBRARY
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+

 IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
 IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)

-#endif
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// 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);
-  event.SetInt(GetValue());
-  event.SetEventObject(this);
-  ProcessCommand(event);
-  return TRUE;
+    wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId);
+    event.SetInt(GetValue());
+    event.SetEventObject(this);
+    ProcessCommand(event);
+    return TRUE;

 }
 
 // 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);
-  SetValidator(validator);
-  if (parent) parent->AddChild(this);
-
-  SetBackgroundColour(parent->GetDefaultBackgroundColour()) ;
-  SetForegroundColour(parent->GetDefaultForegroundColour()) ;
-
-  m_windowStyle = style;
-
-  wxString Label = label;
-  if (Label == "")
-    Label = " "; // 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 && ((m_windowStyle & wxSIMPLE_BORDER) || (m_windowStyle & wxRAISED_BORDER) ||
-       (m_windowStyle & wxSUNKEN_BORDER) || (m_windowStyle & wxDOUBLE_BORDER)))
-    msStyle |= WS_BORDER;
-
-  m_hWnd = (WXHWND)CreateWindowEx(exStyle, "BUTTON", Label,
-                                  msStyle,
-                                  0, 0, 0, 0,
-                                  (HWND)parent->GetHWND(), (HMENU)m_windowId,
-                                  wxGetInstance(), NULL);
-
-#if CTL3D
-  if (want3D)
-  {
-    Ctl3dSubclassCtl((HWND)m_hWnd);
-    m_useCtl3D = TRUE;
-  }
+    SetName(name);
+#if wxUSE_VALIDATORS
+    SetValidator(validator);
+#endif // wxUSE_VALIDATORS
+    if (parent) parent->AddChild(this);
+
+    SetBackgroundColour(parent->GetBackgroundColour()) ;
+    SetForegroundColour(parent->GetForegroundColour()) ;
+
+    m_windowStyle = style;
+
+    wxString Label = label;
+    if (Label == wxT(""))
+        Label = wxT(" "); // 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, wxT("BUTTON"), Label,
+            msStyle,
+            0, 0, 0, 0,
+            (HWND)parent->GetHWND(), (HMENU)m_windowId,
+            wxGetInstance(), NULL);
+
+#if wxUSE_CTL3D
+    if (want3D)
+    {
+        Ctl3dSubclassCtl(GetHwnd());
+        m_useCtl3D = TRUE;
+    }

 #endif
 
 #endif
 

-  // Subclass again for purposes of dialog editing mode
-  SubclassWin(m_hWnd);
-  
-  SetFont(*parent->GetFont());
+    // Subclass again for purposes of dialog editing mode
+    SubclassWin(m_hWnd);

 
 

-  SetSize(x, y, width, height);
+    SetFont(parent->GetFont());

 
 

-  return TRUE;
+    SetSize(x, y, width, height);
+
+    return TRUE;

 }
 
 void wxCheckBox::SetLabel(const wxString& label)
 {
 }
 
 void wxCheckBox::SetLabel(const wxString& label)
 {

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

 }
 
 }
 

-void wxCheckBox::SetSize(int x, int y, int width, int height, int sizeFlags)
+wxSize wxCheckBox::DoGetBestSize() 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);
+    int wCheckbox, hCheckbox;

 
 

-  int current_width, cyf;
-  HWND button = (HWND) GetHWND();
+    wxString str = wxGetWindowText(GetHWND());

 
 

-  int nLen = GetWindowTextLength(button);
-  wxString str;
-  GetWindowText(button, str.GetWriteBuf(nLen), nLen);
-  str.UngetWriteBuf();
+    if ( !str.IsEmpty() )
+    {
+        GetTextExtent(str, &wCheckbox, &hCheckbox);
+        wCheckbox += RADIO_SIZE;

 
 

-  if ( !str.IsEmpty() )
-  {
-    GetTextExtent(str, &current_width, &cyf, NULL, NULL, GetFont());
-    if (w1 < 0)
-      w1 = (int)(current_width + RADIO_SIZE);
-    if (h1 < 0)
+        if ( hCheckbox < RADIO_SIZE )
+            hCheckbox = RADIO_SIZE;
+    }
+    else

     {
     {

-      h1 = (int)(cyf);
-      if (h1 < RADIO_SIZE)
-        h1 = RADIO_SIZE;
+        wCheckbox = RADIO_SIZE;
+        hCheckbox = RADIO_SIZE;

     }
     }

-  }
-  else
-  {
-    if (w1 < 0)
-      w1 = RADIO_SIZE;
-    if (h1 < 0)
-      h1 = RADIO_SIZE;
-  }

 
 

-  MoveWindow(button, x1, y1, w1, h1, TRUE);
+    return wxSize(wCheckbox, hCheckbox);

 }
 
 void wxCheckBox::SetValue(bool val)
 {
 }
 
 void wxCheckBox::SetValue(bool val)
 {

-  SendMessage((HWND) GetHWND(), BM_SETCHECK, val, 0);
+    SendMessage(GetHwnd(), BM_SETCHECK, val, 0);

 }
 
 }
 

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

 #endif
 #endif

-}

 
 

-WXHBRUSH wxCheckBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-                       WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+bool wxCheckBox::GetValue() const

 {
 {

-#if CTL3D
-  if ( m_useCtl3D )
-  {
-    HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
-      
-      return (WXHBRUSH) hbrush;
-  }
+#ifdef __WIN32__
+  return (SendMessage(GetHwnd(), BM_GETCHECK, 0, 0) == BST_CHECKED);
+#else
+  return ((0x003 & SendMessage(GetHwnd(), BM_GETCHECK, 0, 0)) == 0x003);

 #endif
 #endif

-
-  if (GetParent()->GetTransparentBackground())
-    SetBkMode((HDC) pDC, TRANSPARENT);
-  else
-    SetBkMode((HDC) pDC, OPAQUE);
-
-  ::SetBkColor((HDC) pDC, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
-  ::SetTextColor((HDC) pDC, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue()));
-
-  wxBrush *backgroundBrush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID);
-
-  // Note that this will be cleaned up in wxApp::OnIdle, if backgroundBrush
-  // has a zero usage count.
-//  backgroundBrush->RealizeResource();
-  return (WXHBRUSH) backgroundBrush->GetResourceHandle();

 }
 
 void wxCheckBox::Command (wxCommandEvent & event)
 }
 
 void wxCheckBox::Command (wxCommandEvent & event)


@@ -211,6 +187,10 @@ void wxCheckBox::Command (wxCommandEvent & event)
   ProcessCommand (event);
 }
 
   ProcessCommand (event);
 }
 

+// ----------------------------------------------------------------------------
+// wxBitmapCheckBox
+// ----------------------------------------------------------------------------
+

 bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *label,
            const wxPoint& pos,
            const wxSize& size, long style,
 bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *label,
            const wxPoint& pos,
            const wxSize& size, long style,


@@ -218,17 +198,19 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l
            const wxString& name)
 {
   SetName(name);
            const wxString& name)
 {
   SetName(name);

+#if wxUSE_VALIDATORS

   SetValidator(validator);
   SetValidator(validator);

+#endif // wxUSE_VALIDATORS

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

-  SetBackgroundColour(parent->GetDefaultBackgroundColour()) ;
-  SetForegroundColour(parent->GetDefaultForegroundColour()) ;
+  SetBackgroundColour(parent->GetBackgroundColour()) ;
+  SetForegroundColour(parent->GetForegroundColour()) ;

   m_windowStyle = style;
 
   m_windowStyle = style;
 

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

 
   int x = pos.x;
   int y = pos.y;
 
   int x = pos.x;
   int y = pos.y;


@@ -239,16 +221,16 @@ 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, wxT("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);

-         m_useCtl3D = TRUE;
+    m_useCtl3D = TRUE;

   }
 #endif
 
   }
 #endif
 


@@ -257,53 +239,14 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l
   // Subclass again for purposes of dialog editing mode
   SubclassWin((WXHWND)wx_button);
 
   // Subclass again for purposes of dialog editing mode
   SubclassWin((WXHWND)wx_button);
 

-//  SetFont(parent->GetFont());
-

   SetSize(x, y, width, height);
 
   ShowWindow(wx_button, SW_SHOW);
   SetSize(x, y, width, height);
 
   ShowWindow(wx_button, SW_SHOW);

-  return TRUE;
-}
-
-void wxBitmapCheckBox::SetLabel(const wxBitmap *bitmap)
-{
-}
-
-void wxBitmapCheckBox::SetSize(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);
-
-  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);
-}

 
 

-void wxBitmapCheckBox::SetValue(bool val)
-{
-  SendMessage((HWND) GetHWND(), BM_SETCHECK, val, 0);
+  return TRUE;

 }
 
 }
 

-bool wxBitmapCheckBox::GetValue(void) const
+void wxBitmapCheckBox::SetLabel(const wxBitmap& bitmap)

 {
 {

-  return ((0x003 & SendMessage((HWND) GetHWND(), BM_GETCHECK, 0, 0)) == 0x003);
+    wxFAIL_MSG(wxT("not implemented"));

 }
 }

-
-