gizmos fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

contrib/include/wx/gizmos/dynamicsash.h

@@ -13,12 +13,7 @@
 #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.
 */
-class GIZMODLLEXPORT wxDynamicSashSplitEvent : public wxCommandEvent {
+class WXDLLIMPEXP_GIZMOS wxDynamicSashSplitEvent : public wxCommandEvent {
 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.
 */
-class GIZMODLLEXPORT wxDynamicSashUnifyEvent : public wxCommandEvent {
+class WXDLLIMPEXP_GIZMOS wxDynamicSashUnifyEvent : public wxCommandEvent {
 public:
     wxDynamicSashUnifyEvent();
     wxDynamicSashUnifyEvent(const wxDynamicSashUnifyEvent& event): wxCommandEvent(event) {}
@@ -142,9 +137,9 @@ typedef void (wxEvtHandler::*wxDynamicSashUnifyEventFunction)(wxDynamicSashSplit
 /*
     wxDynamicSashWindow.  See above.
 */
-extern const wxChar* GIZMODLLEXPORT wxDynamicSashWindowNameStr;
+extern const wxChar* WXDLLIMPEXP_GIZMOS wxDynamicSashWindowNameStr;
 
-class GIZMODLLEXPORT wxDynamicSashWindow : public wxWindow {
+class WXDLLIMPEXP_GIZMOS wxDynamicSashWindow : public wxWindow {
 public:
     wxDynamicSashWindow();
     wxDynamicSashWindow(wxWindow *parent, wxWindowID id,

contrib/include/wx/gizmos/editlbox.h

@@ -16,13 +16,7 @@
 #endif
 
 #include "wx/panel.h"
-
-#ifdef GIZMOISDLL
-#define GIZMODLLEXPORT WXDLLEXPORT
-#else
-#define GIZMODLLEXPORT
-#endif
-
+#include "wx/gizmos/gizmos.h"
 
 class WXDLLEXPORT wxBitmapButton;
 class WXDLLEXPORT wxListCtrl;
@@ -35,7 +29,7 @@ class WXDLLEXPORT wxListEvent;
 // This class provides a composite control that lets the
 // user easily enter list of strings
 
-class GIZMODLLEXPORT wxEditableListBox : public wxPanel
+class WXDLLIMPEXP_GIZMOS wxEditableListBox : public wxPanel
 {
 	DECLARE_CLASS(wxEditableListBox);
 

contrib/include/wx/gizmos/gizmos.h

@@ -0,0 +1,12 @@
+#ifndef _WX_GIZMOS_H_
+#define _WX_GIZMOS_H_
+
+#ifdef WXMAKINGDLL_GIZMOS
+    #define WXDLLIMPEXP_GIZMOS WXEXPORT
+#elif defined(WXUSINGDLL)
+    #define WXDLLIMPEXP_GIZMOS WXIMPORT
+#else // not making nor using DLL
+    #define WXDLLIMPEXP_GIZMOS
+#endif
+
+#endif

contrib/include/wx/gizmos/ledctrl.h

@@ -5,12 +5,7 @@
     #pragma interface "wxLEDNumberCtrl.h"
 #endif
 
-#ifdef GIZMOISDLL
-#define GIZMODLLEXPORT WXDLLEXPORT
-#else
-#define GIZMODLLEXPORT
-#endif
-
+#include "wx/gizmos/gizmos.h"
 
 #include <wx/window.h>
 #include <wx/control.h>
@@ -38,7 +33,7 @@ enum wxLEDValueAlign
 // wxLEDNumberCtrl
 // ----------------------------------------------------------------------------
 
-class GIZMODLLEXPORT wxLEDNumberCtrl :	public wxControl
+class WXDLLIMPEXP_GIZMOS wxLEDNumberCtrl :	public wxControl
 {
 public:
     // Constructors.

contrib/include/wx/gizmos/multicell.h

@@ -19,13 +19,7 @@
 	#pragma interface "multicell.h"
 #endif
 
-
-#ifdef GIZMOISDLL
-#define GIZMODLLEXPORT WXDLLEXPORT
-#else
-#define GIZMODLLEXPORT
-#endif
-
+#include "wx/gizmos/gizmos.h"
 
 // ----------------------------------------------------------------------------
 // headers
@@ -53,7 +47,7 @@ enum wxResizable
 // wxMultiCellItemHandle
 //---------------------------------------------------------------------------
 
-class GIZMODLLEXPORT wxMultiCellItemHandle: public wxObject
+class WXDLLIMPEXP_GIZMOS wxMultiCellItemHandle: public wxObject
 {
 	DECLARE_CLASS(wxMultiCellItemHandle);
 protected:
@@ -89,7 +83,7 @@ private:
 // wxMultiCellSizer
 //---------------------------------------------------------------------------
 
-class GIZMODLLEXPORT wxMultiCellSizer : virtual public wxSizer
+class WXDLLIMPEXP_GIZMOS wxMultiCellSizer : virtual public wxSizer
 {
 	DECLARE_CLASS(wxMultiCellSizer);
 
@@ -139,7 +133,7 @@ class wxCell;
 // wxMultiCellCanvas
 //---------------------------------------------------------------------------
 
-class GIZMODLLEXPORT wxMultiCellCanvas : public wxFlexGridSizer
+class WXDLLIMPEXP_GIZMOS wxMultiCellCanvas : public wxFlexGridSizer
 {
 public:
 	wxMultiCellCanvas(wxWindow *parent, int numRows = 2, int numCols = 2);

contrib/include/wx/gizmos/splittree.h

@@ -18,11 +18,7 @@
     #pragma interface "splittree.h"
 #endif
 
-#ifdef GIZMOISDLL
-#define GIZMODLLEXPORT WXDLLEXPORT
-#else
-#define GIZMODLLEXPORT
-#endif
+#include "wx/gizmos/gizmos.h"
 
 // Set this to 1 to use generic tree control (doesn't yet work properly)
 #define USE_GENERIC_TREECTRL 0
@@ -52,7 +48,7 @@ class wxSplitterScrolledWindow;
  * It also updates the scrolled window vertical scrollbar as appropriate.
  */
 
-class GIZMODLLEXPORT wxRemotelyScrolledTreeCtrl: public wxTreeCtrl
+class WXDLLIMPEXP_GIZMOS wxRemotelyScrolledTreeCtrl: public wxTreeCtrl
 {
     DECLARE_CLASS(wxRemotelyScrolledTreeCtrl)
 public:
@@ -126,7 +122,7 @@ protected:
  * A window displaying values associated with tree control items.
  */
 
-class GIZMODLLEXPORT wxTreeCompanionWindow: public wxWindow
+class WXDLLIMPEXP_GIZMOS wxTreeCompanionWindow: public wxWindow
 {
 public:
     DECLARE_CLASS(wxTreeCompanionWindow)
@@ -165,7 +161,7 @@ protected:
  * than the usual one.
  */
 
-class GIZMODLLEXPORT wxThinSplitterWindow: public wxSplitterWindow
+class WXDLLIMPEXP_GIZMOS wxThinSplitterWindow: public wxSplitterWindow
 {
 public:
     DECLARE_DYNAMIC_CLASS(wxThinSplitterWindow)
@@ -205,7 +201,7 @@ protected:
  * scroll appropriately.
  */
 
-class GIZMODLLEXPORT wxSplitterScrolledWindow: public wxScrolledWindow
+class WXDLLIMPEXP_GIZMOS wxSplitterScrolledWindow: public wxScrolledWindow
 {
 public:
     DECLARE_DYNAMIC_CLASS(wxSplitterScrolledWindow)