Removed erroneous return statements

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

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index 61eb07927bd573919f7c21155f3282a05681cba2..34dcbf13aedcc81c8b142718a8a03f2adced5f6f 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -5,11 +5,11 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

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

 #pragma implementation "slider95.h"
 #endif
 
 #pragma implementation "slider95.h"
 #endif
 


@@ -33,11 +33,29 @@
 #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
 

-IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
+#if wxUSE_EXTENDED_RTTI
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxSlider95, wxControl,"wx/scrolbar.h")
+
+WX_BEGIN_PROPERTIES_TABLE(wxSlider95)
+       WX_PROPERTY( Value , int , SetValue, GetValue , 0)
+       WX_PROPERTY( Minimum , int , SetMin, GetMin, 0 )
+       WX_PROPERTY( Maximum , int , SetMax, GetMax, 0 )
+       WX_PROPERTY( PageSize , int , SetPageSize, GetLineSize, 1 )
+       WX_PROPERTY( LineSize , int , SetLineSize, GetLineSize, 1 )
+       WX_PROPERTY( ThumbLength , int , SetThumbLength, GetThumbLength, 1 )
+WX_END_PROPERTIES_TABLE()
+
+WX_BEGIN_HANDLERS_TABLE(wxSlider95)
+WX_END_HANDLERS_TABLE()
+
+WX_CONSTRUCTOR_8( wxSlider95 , wxWindow* , Parent , wxWindowID , Id , int , Value , int , Minimum , int , Maximum , wxPoint , Position , wxSize , Size , long , WindowStyle )
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxSlider95, wxControl)
+#endif

 
 // Slider
 wxSlider95::wxSlider95()
 
 // Slider
 wxSlider95::wxSlider95()


@@ -59,6 +77,9 @@ bool wxSlider95::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);


@@ -90,15 +111,14 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
     long msStyle = 0;
     long wstyle = 0;
 
     long msStyle = 0;
     long wstyle = 0;
 

-    if ( m_windowStyle & wxCLIP_SIBLINGS )
-        msStyle |= WS_CLIPSIBLINGS;
-

     if ( m_windowStyle & wxSL_LABELS )
     {
     if ( m_windowStyle & wxSL_LABELS )
     {

-        msStyle |= WS_CHILD | WS_VISIBLE | WS_BORDER | SS_CENTER;
+        msStyle |= SS_CENTER;

 
 

-        bool want3D;
-        WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
+        WXDWORD exStyle = 0;
+        long valueStyle = m_windowStyle & ~wxBORDER_MASK;
+        valueStyle |= wxBORDER_SUNKEN;
+        msStyle |= MSWGetStyle(valueStyle, & exStyle) ;

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


@@ -123,10 +143,9 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
             );
     }
 
             );
     }
 

-    msStyle = 0;
+    WXDWORD exStyle = 0;

 
 

-    if ( m_windowStyle & wxCLIP_SIBLINGS )
-        msStyle |= WS_CLIPSIBLINGS;
+    msStyle = MSWGetStyle(GetWindowStyle(), & exStyle) ;    

 
     if (m_windowStyle & wxSL_VERTICAL)
         msStyle = TBS_VERT | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;
 
     if (m_windowStyle & wxSL_VERTICAL)
         msStyle = TBS_VERT | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;


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

-            MakeExtendedStyle(m_windowStyle), 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


@@ -173,7 +192,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());
 


@@ -593,9 +612,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);
 }