Removed some commented-out code

Added border improvements to changes.txt

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index 987c80786e29c3a718366567c6784b8d027accdb..366a9d2cff844aa601ab036d03f8b2e86c4002b4 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -121,7 +121,9 @@ wxMSW:
 - Windows XP manifest is now included in wx.rc; it is no longer neccessary
   to ship .exe.manifest file with applications to support XP themes
 - wxLocale::Init no longer reports error if trying to set Unicode-only locale
-  or if user's default locale is Unicode-only 
+  or if user's default locale is Unicode-only
+- Improved border handling so it no longer shows a thin and
+  sunken border under XP
 
 wxMotif:
 

diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp
index 0a13eb3e4b86e15170995e72de22b3db917a033c..62d859382690f9fe14d22a81f6c832905ed5f0d7 100644 (file)
--- a/src/msw/gauge95.cpp
+++ b/src/msw/gauge95.cpp
@@ -104,11 +104,6 @@ bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
   WXDWORD exStyle = 0;
   long msFlags = MSWGetStyle(style, & exStyle) ;
 
-/*
-  if ( m_windowStyle & wxCLIP_SIBLINGS )
-    msFlags |= WS_CLIPSIBLINGS;
-*/
-
   if (m_windowStyle & wxGA_VERTICAL)
     msFlags |= PBS_VERTICAL;
 

diff --git a/src/msw/scrolbar.cpp b/src/msw/scrolbar.cpp
index 63cc9f5d4030914412d75e16fa762d9f04e2e84d..5ba271ca2f0be9dcc93de82a2df7eb2100eac72c 100644 (file)
--- a/src/msw/scrolbar.cpp
+++ b/src/msw/scrolbar.cpp
@@ -85,11 +85,6 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
     WXDWORD exStyle = 0;
     WXDWORD wstyle = MSWGetStyle(style, & exStyle) ;
 
-/*    
-    if ( m_windowStyle & wxCLIP_SIBLINGS )
-      wstyle |= WS_CLIPSIBLINGS;
-*/
-
     // Now create scrollbar
     DWORD _direction = (style & wxHORIZONTAL) ?
                         SBS_HORZ: SBS_VERT;

diff --git a/src/msw/slidrmsw.cpp b/src/msw/slidrmsw.cpp
index 0aad8787d239f383c90c98cd15aa198a6a104c82..18431b2e0bab8f9c777f892023a692ce389fa31c 100644 (file)
--- a/src/msw/slidrmsw.cpp
+++ b/src/msw/slidrmsw.cpp
@@ -50,6 +50,9 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
            const wxValidator& validator,
            const wxString& name)
 {
+    if ( (style & wxBORDER_MASK) == wxBORDER_DEFAULT )
+        style |= wxBORDER_NONE;
+
   SetName(name);
 #if wxUSE_VALIDATORS
   SetValidator(validator);
@@ -77,10 +80,9 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
   int height = size.y;
 
   // non-Win95 implementation
-  
+
   long msStyle = SS_CENTER;
 
- // WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
   WXDWORD exStyle = 0;
   msStyle |= MSWGetStyle(GetWindowStyle(), & exStyle) ;
 

diff --git a/src/msw/tglbtn.cpp b/src/msw/tglbtn.cpp
index d98f6bced53a59c53db9fc7ebb105a41d179b135..cac34b1ac94b93674b2e608ea037b79cf29b37ce 100644 (file)
--- a/src/msw/tglbtn.cpp
+++ b/src/msw/tglbtn.cpp
@@ -87,13 +87,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)