xti additions / changes, trying to reduce dependencies

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

diff --git a/src/msw/tglbtn.cpp b/src/msw/tglbtn.cpp
index d98f6bced53a59c53db9fc7ebb105a41d179b135..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;
 
@@ -87,13 +93,8 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
 
    WXDWORD exStyle = 0;
    long msStyle = MSWGetStyle(style, & exStyle) ;
-    
-   msStyle |= BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP ;
 
-/*   
-   if ( m_windowStyle & wxCLIP_SIBLINGS )
-        msStyle |= WS_CLIPSIBLINGS;
-*/
+   msStyle |= BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP ;
 
 #ifdef __WIN32__
    if(m_windowStyle & wxBU_LEFT)