Changed no-remap to msw.remap

[wxWidgets.git] / include / wx / univ / slider.h

diff --git a/include/wx/univ/slider.h b/include/wx/univ/slider.h
index b9a0bf9e9a82a5170fa51d168588c6ceba78d20a..69fe989edbe541c59349412d233f9af0fa91547d 100644 (file)
--- a/include/wx/univ/slider.h
+++ b/include/wx/univ/slider.h
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

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

     #pragma interface "univslider.h"
 #endif
 
     #pragma interface "univslider.h"
 #endif
 


@@ -95,10 +95,14 @@ public:
         { return IsVert() ? wxVERTICAL : wxHORIZONTAL; }
 
     // do we have labels?
         { return IsVert() ? wxVERTICAL : wxHORIZONTAL; }
 
     // do we have labels?

-    bool HasLabels() const { return (GetWindowStyle() & wxSL_LABELS) != 0; }
+    bool HasLabels() const 
+        { return ((GetWindowStyle() & wxSL_LABELS) != 0) &
+                 ((GetWindowStyle() & (wxSL_TOP|wxSL_BOTTOM|wxSL_LEFT|wxSL_RIGHT)) != 0); }

 
     // do we have ticks?
 
     // do we have ticks?

-    bool HasTicks() const { return (GetWindowStyle() & wxSL_TICKS) != 0; }
+    bool HasTicks() const 
+        { return ((GetWindowStyle() & wxSL_TICKS) != 0) &
+                 ((GetWindowStyle() & (wxSL_TOP|wxSL_BOTTOM|wxSL_LEFT|wxSL_RIGHT|wxSL_BOTH)) != 0); }

 
     // implement wxControlWithThumb interface
     virtual wxWindow *GetWindow() { return this; }
 
     // implement wxControlWithThumb interface
     virtual wxWindow *GetWindow() { return this; }


@@ -231,15 +235,15 @@ public:
     }
 
     // base class methods
     }
 
     // base class methods

-    virtual bool HandleKey(wxControl *control,
+    virtual bool HandleKey(wxInputConsumer *consumer,

                            const wxKeyEvent& event,
                            bool pressed);
                            const wxKeyEvent& event,
                            bool pressed);

-    virtual bool HandleMouse(wxControl *control,
+    virtual bool HandleMouse(wxInputConsumer *consumer,

                              const wxMouseEvent& event);
                              const wxMouseEvent& event);

-    virtual bool HandleMouseMove(wxControl *control,
+    virtual bool HandleMouseMove(wxInputConsumer *consumer,

                                  const wxMouseEvent& event);
 
                                  const wxMouseEvent& event);
 

-    virtual bool HandleFocus(wxControl *control, const wxFocusEvent& event);
+    virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event);

 };
 
 #endif // _WX_UNIV_SLIDER_H_
 };
 
 #endif // _WX_UNIV_SLIDER_H_