declare rich text control event types with correct dll export qualifiers

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

diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index 111136f453bae20575866864d73e2bdda6e6b798..dcbc0ef320a672adc5b43e5e663b646c0b228c5a 100644 (file)
--- a/include/wx/scrolwin.h
+++ b/include/wx/scrolwin.h
@@ -12,13 +12,11 @@
 #ifndef _WX_SCROLWIN_H_BASE_
 #define _WX_SCROLWIN_H_BASE_
 
-#include "wx/window.h"
+#include "wx/panel.h"
 
 class WXDLLEXPORT wxScrollHelperEvtHandler;
 class WXDLLEXPORT wxTimer;
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
-
 // default scrolled window style: scroll in both directions
 #define wxScrolledWindowStyle (wxHSCROLL | wxVSCROLL)
 
@@ -247,8 +245,10 @@ protected:
         { return ScrollGetWindowSizeForVirtualSize(size); }
 
 // include the declaration of wxScrollHelperNative if needed
-#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__)
+#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk/scrolwin.h"
+#elif defined(__WXGTK__) && !defined(__WXUNIVERSAL__)
+    #include "wx/gtk1/scrolwin.h"
 #else
     typedef wxScrollHelper wxScrollHelperNative;
 #endif