fix for HP aCC

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

diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h
index 92b17be4a71b6cf7a75b79eb1bcc9d8d3b6c48d0..1dc43df0243dd8f21eae57e4b5b377d44b04cc4c 100644 (file)
--- a/include/wx/univ/window.h
+++ b/include/wx/univ/window.h
@@ -16,18 +16,18 @@
 
 #include "wx/bitmap.h"      // for m_bitmapBg
 
 
 #include "wx/bitmap.h"      // for m_bitmapBg
 

-class WXDLLEXPORT wxControlRenderer;
-class WXDLLEXPORT wxEventLoop;
+class WXDLLIMPEXP_FWD_CORE wxControlRenderer;
+class WXDLLIMPEXP_FWD_CORE wxEventLoop;

 
 #if wxUSE_MENUS
 
 #if wxUSE_MENUS

-    class WXDLLEXPORT wxMenu;
-    class WXDLLEXPORT wxMenuBar;
+    class WXDLLIMPEXP_FWD_CORE wxMenu;
+    class WXDLLIMPEXP_FWD_CORE wxMenuBar;

 #endif // wxUSE_MENUS
 
 #endif // wxUSE_MENUS
 

-class WXDLLEXPORT wxRenderer;
+class WXDLLIMPEXP_FWD_CORE wxRenderer;

 
 #if wxUSE_SCROLLBAR
 
 #if wxUSE_SCROLLBAR

-    class WXDLLEXPORT wxScrollBar;
+    class WXDLLIMPEXP_FWD_CORE wxScrollBar;

 #endif // wxUSE_SCROLLBAR
 
 #ifdef __WXX11__
 #endif // wxUSE_SCROLLBAR
 
 #ifdef __WXX11__


@@ -52,7 +52,7 @@ class WXDLLEXPORT wxRenderer;
 #define wxWindowNative wxWindowMac
 #endif
 
 #define wxWindowNative wxWindowMac
 #endif
 

-class WXDLLEXPORT wxWindow : public wxWindowNative
+class WXDLLIMPEXP_CORE wxWindow : public wxWindowNative

 {
 public:
     // ctors and create functions
 {
 public:
     // ctors and create functions


@@ -102,7 +102,7 @@ public:
     virtual int GetScrollThumb(int orient) const;
     virtual int GetScrollRange(int orient) const;
     virtual void ScrollWindow(int dx, int dy,
     virtual int GetScrollThumb(int orient) const;
     virtual int GetScrollRange(int orient) const;
     virtual void ScrollWindow(int dx, int dy,

-                              const wxRect* rect = (wxRect *) NULL);
+                              const wxRect* rect = NULL);

 
     // take into account the borders here
     virtual wxPoint GetClientAreaOrigin() const;
 
     // take into account the borders here
     virtual wxPoint GetClientAreaOrigin() const;