Added files for wxNotebook and wxCocoaNSTabView

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

diff --git a/src/msw/slidrmsw.cpp b/src/msw/slidrmsw.cpp
index 0aad8787d239f383c90c98cd15aa198a6a104c82..48cfaf922abbf1559a4171afb0f10aee82c016b4 100644 (file)
--- a/src/msw/slidrmsw.cpp
+++ b/src/msw/slidrmsw.cpp
@@ -9,7 +9,7 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "slidrmsw.h"
 #endif
 
 #pragma implementation "slidrmsw.h"
 #endif
 


@@ -50,6 +50,9 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {

+    if ( (style & wxBORDER_MASK) == wxBORDER_DEFAULT )
+        style |= wxBORDER_NONE;
+

   SetName(name);
 #if wxUSE_VALIDATORS
   SetValidator(validator);
   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
   int height = size.y;
 
   // non-Win95 implementation

-  
+

   long msStyle = SS_CENTER;
 
   long msStyle = SS_CENTER;
 

- // WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;

   WXDWORD exStyle = 0;
   msStyle |= MSWGetStyle(GetWindowStyle(), & exStyle) ;
 
   WXDWORD exStyle = 0;
   msStyle |= MSWGetStyle(GetWindowStyle(), & exStyle) ;
 


@@ -106,7 +108,7 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
   else
     msStyle = SBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;
 
   else
     msStyle = SBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;
 

-  HWND scroll_bar = CreateWindowEx(exStyle, wxT("SCROLLBAR"), wxT(""),
+  HWND scroll_bar = CreateWindowEx(exStyle, wxT("SCROLLBAR"), wxEmptyString,

                          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);