X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a290fa5a7deebe9d96c0c0089d18e27d4bd9b624..9eb5cd3b1fde80564d9c67afea154448a33836a1:/include/wx/univ/slider.h

diff --git a/include/wx/univ/slider.h b/include/wx/univ/slider.h
index 634085cf51..ac92c6a873 100644
--- a/include/wx/univ/slider.h
+++ b/include/wx/univ/slider.h
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "univslider.h"
-#endif
-
 #ifndef _WX_UNIV_SLIDER_H_
 #define _WX_UNIV_SLIDER_H_
 
@@ -95,13 +91,13 @@ public:
         { 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?
-    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
@@ -125,6 +121,10 @@ public:
     // for wxStdSliderButtonInputHandler
     wxScrollThumb& GetThumb() { return m_thumb; }
 
+    virtual bool PerformAction(const wxControlAction& action,
+                               long numArg = 0,
+                               const wxString& strArg = wxEmptyString);
+
 protected:
     enum
     {
@@ -136,10 +136,6 @@ protected:
     virtual void DoDraw(wxControlRenderer *renderer);
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 
-    virtual bool PerformAction(const wxControlAction& action,
-                               long numArg = 0,
-                               const wxString& strArg = wxEmptyString);
-
     // event handlers
     void OnSize(wxSizeEvent& event);