Tweaks to install guide

[wxWidgets.git] / contrib / include / wx / gizmos / dynamicsash.h

diff --git a/contrib/include/wx/gizmos/dynamicsash.h b/contrib/include/wx/gizmos/dynamicsash.h
index 6ad05841c3ef3c8801102eac50cb7eff8da0ff28..c94fc3ee2beeee81272f33ea51a54322a389e91b 100644 (file)
--- a/contrib/include/wx/gizmos/dynamicsash.h
+++ b/contrib/include/wx/gizmos/dynamicsash.h
@@ -13,12 +13,7 @@
 #ifndef _WX_DYNAMICSASH_H_
 #define _WX_DYNAMICSASH_H_
 
 #ifndef _WX_DYNAMICSASH_H_
 #define _WX_DYNAMICSASH_H_
 

-#ifdef GIZMOISDLL
-#define GIZMODLLEXPORT WXDLLEXPORT
-#else
-#define GIZMODLLEXPORT
-#endif
-
+#include "wx/gizmos/gizmos.h"

 
 /*
 
 
 /*
 


@@ -102,7 +97,7 @@ class wxScrollBar;
     a child of the wxDynamicSashWindow.  wxDynamicSashWindow will
     automatically reparent it to the proper place in its window hierarchy.
 */
     a child of the wxDynamicSashWindow.  wxDynamicSashWindow will
     automatically reparent it to the proper place in its window hierarchy.
 */

-class GIZMODLLEXPORT wxDynamicSashSplitEvent : public wxCommandEvent {
+class WXDLLIMPEXP_GIZMOS wxDynamicSashSplitEvent : public wxCommandEvent {

 public:
     wxDynamicSashSplitEvent();
     wxDynamicSashSplitEvent(const wxDynamicSashSplitEvent& event): wxCommandEvent(event) { }
 public:
     wxDynamicSashSplitEvent();
     wxDynamicSashSplitEvent(const wxDynamicSashSplitEvent& event): wxCommandEvent(event) { }


@@ -124,7 +119,7 @@ private:
     the scrollbars' event handlers connected to your view's event handler
     class.
 */
     the scrollbars' event handlers connected to your view's event handler
     class.
 */

-class GIZMODLLEXPORT wxDynamicSashUnifyEvent : public wxCommandEvent {
+class WXDLLIMPEXP_GIZMOS wxDynamicSashUnifyEvent : public wxCommandEvent {

 public:
     wxDynamicSashUnifyEvent();
     wxDynamicSashUnifyEvent(const wxDynamicSashUnifyEvent& event): wxCommandEvent(event) {}
 public:
     wxDynamicSashUnifyEvent();
     wxDynamicSashUnifyEvent(const wxDynamicSashUnifyEvent& event): wxCommandEvent(event) {}


@@ -133,18 +128,18 @@ public:
     virtual wxEvent* Clone() const { return new wxDynamicSashUnifyEvent(*this); }
 
 private:
     virtual wxEvent* Clone() const { return new wxDynamicSashUnifyEvent(*this); }
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxDynamicSashUnifyEvent);
+    DECLARE_DYNAMIC_CLASS(wxDynamicSashUnifyEvent)

 };
 
 typedef void (wxEvtHandler::*wxDynamicSashSplitEventFunction)(wxDynamicSashSplitEvent&);
 };
 
 typedef void (wxEvtHandler::*wxDynamicSashSplitEventFunction)(wxDynamicSashSplitEvent&);

-typedef void (wxEvtHandler::*wxDynamicSashUnifyEventFunction)(wxDynamicSashSplitEvent&);
+typedef void (wxEvtHandler::*wxDynamicSashUnifyEventFunction)(wxDynamicSashUnifyEvent&);

 
 /*
     wxDynamicSashWindow.  See above.
 */
 
 /*
     wxDynamicSashWindow.  See above.
 */

-extern const wxChar* GIZMODLLEXPORT wxDynamicSashWindowNameStr;
+WXDLLIMPEXP_GIZMOS extern const wxChar* wxDynamicSashWindowNameStr;

 
 

-class GIZMODLLEXPORT wxDynamicSashWindow : public wxWindow {
+class WXDLLIMPEXP_GIZMOS wxDynamicSashWindow : public wxWindow {

 public:
     wxDynamicSashWindow();
     wxDynamicSashWindow(wxWindow *parent, wxWindowID id,
 public:
     wxDynamicSashWindow();
     wxDynamicSashWindow(wxWindow *parent, wxWindowID id,