wxUniv compilation fixes

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

diff --git a/src/msw/tglbtn.cpp b/src/msw/tglbtn.cpp
index 58889e0fb962ac069b6a6d216f1c6ab7e5caf054..b73b9aa4ebd4bfe5877bc3ff668c5e9ad7376d99 100644 (file)
--- a/src/msw/tglbtn.cpp
+++ b/src/msw/tglbtn.cpp
@@ -73,6 +73,12 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
                             const wxValidator& validator,
                             const wxString& name)
 {
+    // default border for this control is none
+    if ( (style & wxBORDER_MASK) == wxBORDER_DEFAULT )
+    {
+        style |= wxBORDER_NONE;
+    }
+    
    if (!CreateBase(parent, id, pos, size, style, validator, name))
       return FALSE;
 
@@ -85,10 +91,10 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
 #define BS_PUSHLIKE 0x00001000L
 #endif
 
-   long msStyle = BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP | WS_CHILD | WS_VISIBLE;
+   WXDWORD exStyle = 0;
+   long msStyle = MSWGetStyle(style, & exStyle) ;
 
-   if ( m_windowStyle & wxCLIP_SIBLINGS )
-        msStyle |= WS_CLIPSIBLINGS;
+   msStyle |= BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP ;
 
 #ifdef __WIN32__
    if(m_windowStyle & wxBU_LEFT)
@@ -101,7 +107,7 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
       msStyle |= BS_BOTTOM;
 #endif
 
-   m_hWnd = (WXHWND)CreateWindowEx(MakeExtendedStyle(m_windowStyle),
+   m_hWnd = (WXHWND)CreateWindowEx(exStyle,
                                    wxT("BUTTON"), label,
                                    msStyle, 0, 0, 0, 0,
                                    (HWND)parent->GetHWND(),