added wxEncodingToCodepage() and implemented it properly (using in32 API instead...

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

diff --git a/include/wx/os2/scrolbar.h b/include/wx/os2/scrolbar.h
index 7be44ed401ee3f6f814cff0eabaef2ad46e2601f..c7798d15296830467581499481dec4f8b1b4d2fc 100644 (file)
--- a/include/wx/os2/scrolbar.h
+++ b/include/wx/os2/scrolbar.h
@@ -12,12 +12,12 @@
 #ifndef _WX_SCROLBAR_H_
 #define _WX_SCROLBAR_H_
 
 #ifndef _WX_SCROLBAR_H_
 #define _WX_SCROLBAR_H_
 

-#include "wx/control.h"
+#include "wx/scrolbar.h"

 
 WXDLLEXPORT_DATA(extern const char*) wxScrollBarNameStr;
 
 // Scrollbar item
 
 WXDLLEXPORT_DATA(extern const char*) wxScrollBarNameStr;
 
 // Scrollbar item

-class WXDLLEXPORT wxScrollBar: public wxControl
+class WXDLLEXPORT wxScrollBar: public wxScrollBarBase

 {
   DECLARE_DYNAMIC_CLASS(wxScrollBar)
 
 {
   DECLARE_DYNAMIC_CLASS(wxScrollBar)
 


@@ -30,11 +30,7 @@ public:
            const wxSize& size = wxDefaultSize,
            long style = wxSB_HORIZONTAL,
 #if wxUSE_VALIDATORS
            const wxSize& size = wxDefaultSize,
            long style = wxSB_HORIZONTAL,
 #if wxUSE_VALIDATORS

-#  if defined(__VISAGECPP__)
-           const wxValidator* validator = wxDefaultValidator,
-#  else

            const wxValidator& validator = wxDefaultValidator,
            const wxValidator& validator = wxDefaultValidator,

-#  endif

 #endif
            const wxString& name = wxScrollBarNameStr)
   {
 #endif
            const wxString& name = wxScrollBarNameStr)
   {


@@ -45,11 +41,7 @@ public:
            const wxSize& size = wxDefaultSize,
            long style = wxSB_HORIZONTAL,
 #if wxUSE_VALIDATORS
            const wxSize& size = wxDefaultSize,
            long style = wxSB_HORIZONTAL,
 #if wxUSE_VALIDATORS

-#  if defined(__VISAGECPP__)
-           const wxValidator* validator = wxDefaultValidator,
-#  else

            const wxValidator& validator = wxDefaultValidator,
            const wxValidator& validator = wxDefaultValidator,

-#  endif

 #endif
            const wxString& name = wxScrollBarNameStr);
 
 #endif
            const wxString& name = wxScrollBarNameStr);