Fixed non-precompiled headers compilation

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

diff --git a/src/msw/tglbtn.cpp b/src/msw/tglbtn.cpp
index eb3ba7f2f3507be1646b1a90d25f23fd559c0c02..358a3a0a209ee169be4052ef8345df136832dcab 100644 (file)
--- a/src/msw/tglbtn.cpp
+++ b/src/msw/tglbtn.cpp
@@ -2,17 +2,17 @@
 // Name:        src/msw/tglbtn.cpp
 // Purpose:     Definition of the wxToggleButton class, which implements a
 //              toggle button under wxMSW.
 // Name:        src/msw/tglbtn.cpp
 // Purpose:     Definition of the wxToggleButton class, which implements a
 //              toggle button under wxMSW.

-// Author: John Norris, minor changes by Axel Schlueter
-// and William Gallafent.
+// Author:      John Norris, minor changes by Axel Schlueter
+//              and William Gallafent.

 // Modified by:
 // Created:     08.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Johnny C. Norris II
 // Modified by:
 // Created:     08.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Johnny C. Norris II

-// License:     Rocketeer license
+// License:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================

-// declatations
+// declarations

 // ============================================================================
 
 // ----------------------------------------------------------------------------
 // ============================================================================
 
 // ----------------------------------------------------------------------------


@@ -25,10 +25,10 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/tglbtn.h"
-

 #if wxUSE_TOGGLEBTN
 
 #if wxUSE_TOGGLEBTN
 

+#include "wx/tglbtn.h"
+

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


@@ -39,6 +39,7 @@
 #endif // WX_PRECOMP
 
 #include "wx/msw/private.h"
 #endif // WX_PRECOMP
 
 #include "wx/msw/private.h"

+#include "wx/msw/private/button.h"

 
 // ----------------------------------------------------------------------------
 // macros
 
 // ----------------------------------------------------------------------------
 // macros


@@ -47,8 +48,6 @@
 IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED)
 
 IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED)
 

-#define BUTTON_HEIGHT_FROM_CHAR_HEIGHT(cy) (11*EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)/10)
-

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


@@ -57,17 +56,9 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED)
 // wxToggleButton
 // ----------------------------------------------------------------------------
 
 // wxToggleButton
 // ----------------------------------------------------------------------------
 

-bool wxToggleButton::MSWCommand(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id))
-{
-   wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, m_windowId);
-   event.SetInt(GetValue());
-   event.SetEventObject(this);
-   ProcessCommand(event);
-   return true;
-}
-

 // Single check box item
 // Single check box item

-bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
+bool wxToggleButton::Create(wxWindow *parent,
+                            wxWindowID id,

                             const wxString& label,
                             const wxPoint& pos,
                             const wxSize& size, long style,
                             const wxString& label,
                             const wxPoint& pos,
                             const wxSize& size, long style,


@@ -77,34 +68,32 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
         return false;
 
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
         return false;
 

-    if ( !MSWCreateControl(wxT("BUTTON"), label, pos, size) )
-      return false;
-
-    return true;
-}
-
-wxBorder wxToggleButton::GetDefaultBorder() const
-{
-    return wxBORDER_NONE;
+    // if the label contains several lines we must explicitly tell the button
+    // about it or it wouldn't draw it correctly ("\n"s would just appear as
+    // black boxes)
+    //
+    // NB: we do it here and not in MSWGetStyle() because we need the label
+    //     value and the label is not set yet when MSWGetStyle() is called
+    WXDWORD exstyle;
+    WXDWORD msStyle = MSWGetStyle(style, &exstyle);
+    msStyle |= wxMSWButton::GetMultilineStyle(label);
+
+    return MSWCreateControl(_T("BUTTON"), msStyle, pos, size, label, exstyle);

 }
 
 WXDWORD wxToggleButton::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
 
 }
 
 WXDWORD wxToggleButton::MSWGetStyle(long style, WXDWORD *exstyle) const
 {
     WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
 

-#ifndef BS_PUSHLIKE
-#define BS_PUSHLIKE 0x00001000L
-#endif
-

     msStyle |= BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP;
 
     msStyle |= BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP;
 

-    if(style & wxBU_LEFT)
+    if ( style & wxBU_LEFT )

       msStyle |= BS_LEFT;
       msStyle |= BS_LEFT;

-    if(style & wxBU_RIGHT)
+    if ( style & wxBU_RIGHT )

       msStyle |= BS_RIGHT;
       msStyle |= BS_RIGHT;

-    if(style & wxBU_TOP)
+    if ( style & wxBU_TOP )

       msStyle |= BS_TOP;
       msStyle |= BS_TOP;

-    if(style & wxBU_BOTTOM)
+    if ( style & wxBU_BOTTOM )

       msStyle |= BS_BOTTOM;
 
     return msStyle;
       msStyle |= BS_BOTTOM;
 
     return msStyle;


@@ -112,30 +101,14 @@ WXDWORD wxToggleButton::MSWGetStyle(long style, WXDWORD *exstyle) const
 
 wxSize wxToggleButton::DoGetBestSize() const
 {
 
 wxSize wxToggleButton::DoGetBestSize() const
 {

-   wxString label = wxGetWindowText(GetHWND());
-   int wBtn;
-   GetTextExtent(label, &wBtn, NULL);
-
-   int wChar, hChar;
-   wxGetCharSize(GetHWND(), &wChar, &hChar, GetFont());
-
-   // add a margin - the button is wider than just its label
-   wBtn += 3*wChar;
-
-   // the button height is proportional to the height of the font used
-   int hBtn = BUTTON_HEIGHT_FROM_CHAR_HEIGHT(hChar);
-
-#if wxUSE_BUTTON
-   wxSize sz = wxButton::GetDefaultSize();
-   if (wBtn > sz.x)
-       sz.x = wBtn;
-   if (hBtn > sz.y)
-       sz.y = hBtn;
-#else
-   wxSize sz(wBtn, hBtn);
-#endif
+    return wxMSWButton::ComputeBestSize(wx_const_cast(wxToggleButton *, this));
+}

 
 

-   return sz;
+void wxToggleButton::SetLabel(const wxString& label)
+{
+    wxMSWButton::UpdateMultilineStyle(GetHwnd(), label);
+
+    wxToggleButtonBase::SetLabel(label);

 }
 
 void wxToggleButton::SetValue(bool val)
 }
 
 void wxToggleButton::SetValue(bool val)


@@ -143,24 +116,24 @@ void wxToggleButton::SetValue(bool val)
    ::SendMessage(GetHwnd(), BM_SETCHECK, val, 0);
 }
 
    ::SendMessage(GetHwnd(), BM_SETCHECK, val, 0);
 }
 

-#ifndef BST_CHECKED
-#define BST_CHECKED 0x0001
-#endif
-

 bool wxToggleButton::GetValue() const
 {
 bool wxToggleButton::GetValue() const
 {

-#ifdef __WIN32__
-   return (::SendMessage(GetHwnd(), BM_GETCHECK, 0, 0) == BST_CHECKED);
-#else
-   return ((0x001 & ::SendMessage(GetHwnd(), BM_GETCHECK, 0, 0)) == 0x001);
-#endif
+    return ::SendMessage(GetHwnd(), BM_GETCHECK, 0, 0) == BST_CHECKED;

 }
 
 }
 

-void wxToggleButton::Command(wxCommandEvent & event)
+void wxToggleButton::Command(wxCommandEvent& event)

 {
 {

-   SetValue((event.GetInt() != 0));
-   ProcessCommand(event);
+    SetValue(event.GetInt() != 0);
+    ProcessCommand(event);

 }
 
 }
 

-#endif // wxUSE_TOGGLEBTN
+bool wxToggleButton::MSWCommand(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id))
+{
+    wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, m_windowId);
+    event.SetInt(GetValue());
+    event.SetEventObject(this);
+    ProcessCommand(event);
+    return true;
+}

 
 

+#endif // wxUSE_TOGGLEBTN