Compilaton fixes.

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

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index ba25fe168717c5a9d604919944738eceb0cbaa24..c6d402a15a4544875d24ccdd192a783530599407 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -33,7 +33,7 @@
 #include "wx/msw/slider95.h"
 #include "wx/msw/private.h"
 
 #include "wx/msw/slider95.h"
 #include "wx/msw/private.h"
 

-#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
+#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))

     #include <commctrl.h>
 #endif
 
     #include <commctrl.h>
 #endif
 


@@ -98,7 +98,9 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
         msStyle |= SS_CENTER;
 
         WXDWORD exStyle = 0;
         msStyle |= SS_CENTER;
 
         WXDWORD exStyle = 0;

-        msStyle |= MSWGetStyle(GetWindowStyle(), & exStyle) ;
+        long valueStyle = m_windowStyle & ~wxBORDER_MASK;
+        valueStyle |= wxBORDER_SUNKEN;
+        msStyle |= MSWGetStyle(valueStyle, & exStyle) ;

 
         m_staticValue = (WXHWND) CreateWindowEx
             (
 
         m_staticValue = (WXHWND) CreateWindowEx
             (


@@ -153,7 +155,7 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
 
     HWND scroll_bar = CreateWindowEx
         (
 
     HWND scroll_bar = CreateWindowEx
         (

-            exStyle, TRACKBAR_CLASS, wxT(""),
+            exStyle, TRACKBAR_CLASS, 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


@@ -172,7 +174,7 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
 
     SubclassWin(GetHWND());
 
 
     SubclassWin(GetHWND());
 

-    ::SetWindowText((HWND) m_hWnd, wxT(""));
+    ::SetWindowText((HWND) m_hWnd, wxEmptyString);

 
     SetFont(parent->GetFont());
 
 
     SetFont(parent->GetFont());
 


@@ -592,9 +594,13 @@ void wxSlider95::SetRange(int minValue, int maxValue)
 WXHBRUSH wxSlider95::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
             WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {
 WXHBRUSH wxSlider95::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
             WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {

+#ifndef __WXWINCE__

     if ( nCtlColor == CTLCOLOR_SCROLLBAR )
         return 0;
     if ( nCtlColor == CTLCOLOR_SCROLLBAR )
         return 0;

-
+#else
+    if ( nCtlColor != CTLCOLOR_STATIC )
+        return 0;
+#endif

     // Otherwise, it's a static
     return wxControl::OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam);
 }
     // Otherwise, it's a static
     return wxControl::OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam);
 }