Fix for wxTextCtrl::GetSelection for singel line controls in GTK2 mode

[wxWidgets.git] / include / wx / scrolbar.h

diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h
index f995c03e5a63a0c3dca52a4ef13ba3cdebb6d0eb..7411fabf3932ba367575b8e342c426b84c8b91e6 100644 (file)
--- a/include/wx/scrolbar.h
+++ b/include/wx/scrolbar.h
@@ -14,6 +14,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxScrollBarNameStr;
 class WXDLLEXPORT wxScrollBarBase : public wxControl
 {
 public:
 class WXDLLEXPORT wxScrollBarBase : public wxControl
 {
 public:

+    wxScrollBarBase() { }
+

     // scrollbar construction
     bool Create(wxWindow *parent,
                 wxWindowID id,
     // scrollbar construction
     bool Create(wxWindow *parent,
                 wxWindowID id,


@@ -36,6 +38,9 @@ public:
     virtual void SetScrollbar(int position, int thumbSize,
                               int range, int pageSize,
                               bool refresh = TRUE) = 0;
     virtual void SetScrollbar(int position, int thumbSize,
                               int range, int pageSize,
                               bool refresh = TRUE) = 0;

+
+private:
+    DECLARE_NO_COPY_CLASS(wxScrollBarBase)

 };
 
 #if defined(__WXUNIVERSAL__)
 };
 
 #if defined(__WXUNIVERSAL__)


@@ -46,14 +51,10 @@ public:
     #include "wx/motif/scrolbar.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/scrolbar.h"
     #include "wx/motif/scrolbar.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/scrolbar.h"

-#elif defined(__WXQT__)
-    #include "wx/qt/scrolbar.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/scrolbar.h"
 #elif defined(__WXPM__)
     #include "wx/os2/scrolbar.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/scrolbar.h"
 #elif defined(__WXPM__)
     #include "wx/os2/scrolbar.h"

-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/scrolbar.h"

 #endif
 
 #endif // wxUSE_SCROLLBAR
 #endif
 
 #endif // wxUSE_SCROLLBAR