AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed WXDLLEXPORT --> GIZMOSDLLEXPORT (and added it where is wasn't

Browse Source 
used) so gizmos can be used with wx DLL but not be a DLL itself.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2001-11-26 19:58:06 +00:00
parent 13960e3c69
commit 086ab76622
4 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
contrib/include/wx/gizmos/dynamicsash.h
View File

@ -13,6 +13,13 @@
#ifndef _WX_DYNAMICSASH_H_ #ifndef _WX_DYNAMICSASH_H_
#define _WX_DYNAMICSASH_H_ #define _WX_DYNAMICSASH_H_
#ifdef GIZMOISDLL
#define GIZMODLLEXPORT WXDLLEXPORT
#else
#define GIZMODLLEXPORT
#endif
/* /*
wxDynamicSashWindow wxDynamicSashWindow
@ -95,7 +102,7 @@ class wxScrollBar;
a child of the wxDynamicSashWindow. wxDynamicSashWindow will a child of the wxDynamicSashWindow. wxDynamicSashWindow will
automatically reparent it to the proper place in its window hierarchy. automatically reparent it to the proper place in its window hierarchy.
*/ */
class wxDynamicSashSplitEvent : public wxCommandEvent { class GIZMODLLEXPORT wxDynamicSashSplitEvent : public wxCommandEvent {
public: public:
wxDynamicSashSplitEvent(); wxDynamicSashSplitEvent();
wxDynamicSashSplitEvent(const wxDynamicSashSplitEvent& event): wxCommandEvent(event) { } wxDynamicSashSplitEvent(const wxDynamicSashSplitEvent& event): wxCommandEvent(event) { }
@ -117,7 +124,7 @@ private:
the scrollbars' event handlers connected to your view's event handler the scrollbars' event handlers connected to your view's event handler
class. class.
*/ */
class wxDynamicSashUnifyEvent : public wxCommandEvent { class GIZMODLLEXPORT wxDynamicSashUnifyEvent : public wxCommandEvent {
public: public:
wxDynamicSashUnifyEvent(); wxDynamicSashUnifyEvent();
wxDynamicSashUnifyEvent(const wxDynamicSashUnifyEvent& event): wxCommandEvent(event) {} wxDynamicSashUnifyEvent(const wxDynamicSashUnifyEvent& event): wxCommandEvent(event) {}
@ -132,7 +139,7 @@ private:
/* /*
wxDynamicSashWindow. See above. wxDynamicSashWindow. See above.
*/ */
class wxDynamicSashWindow : public wxWindow { class GIZMODLLEXPORT wxDynamicSashWindow : public wxWindow {
public: public:
wxDynamicSashWindow(); wxDynamicSashWindow();
wxDynamicSashWindow(wxWindow *parent, wxWindowID id, wxDynamicSashWindow(wxWindow *parent, wxWindowID id,

8
contrib/include/wx/gizmos/editlbox.h
View File

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

14
contrib/include/wx/gizmos/multicell.h
View File

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

14
contrib/include/wx/gizmos/splittree.h
View File

@ -18,6 +18,12 @@
#pragma interface "splittree.h" #pragma interface "splittree.h"
#endif #endif
#ifdef GIZMOISDLL
#define GIZMODLLEXPORT WXDLLEXPORT
#else
#define GIZMODLLEXPORT
#endif
// Set this to 1 to use generic tree control (doesn't yet work properly) // Set this to 1 to use generic tree control (doesn't yet work properly)
#define USE_GENERIC_TREECTRL 0 #define USE_GENERIC_TREECTRL 0
@ -46,7 +52,7 @@ class wxSplitterScrolledWindow;
* It also updates the scrolled window vertical scrollbar as appropriate. * It also updates the scrolled window vertical scrollbar as appropriate.
*/ */
class wxRemotelyScrolledTreeCtrl: public wxTreeCtrl class GIZMODLLEXPORT wxRemotelyScrolledTreeCtrl: public wxTreeCtrl
{ {
DECLARE_CLASS(wxRemotelyScrolledTreeCtrl) DECLARE_CLASS(wxRemotelyScrolledTreeCtrl)
public: public:
@ -118,7 +124,7 @@ protected:
* A window displaying values associated with tree control items. * A window displaying values associated with tree control items.
*/ */
class wxTreeCompanionWindow: public wxWindow class GIZMODLLEXPORT wxTreeCompanionWindow: public wxWindow
{ {
public: public:
DECLARE_CLASS(wxTreeCompanionWindow) DECLARE_CLASS(wxTreeCompanionWindow)
@ -157,7 +163,7 @@ protected:
* than the usual one. * than the usual one.
*/ */
class wxThinSplitterWindow: public wxSplitterWindow class GIZMODLLEXPORT wxThinSplitterWindow: public wxSplitterWindow
{ {
public: public:
DECLARE_DYNAMIC_CLASS(wxThinSplitterWindow) DECLARE_DYNAMIC_CLASS(wxThinSplitterWindow)
@ -197,7 +203,7 @@ protected:
* scroll appropriately. * scroll appropriately.
*/ */
class wxSplitterScrolledWindow: public wxScrolledWindow class GIZMODLLEXPORT wxSplitterScrolledWindow: public wxScrolledWindow
{ {
public: public:
DECLARE_DYNAMIC_CLASS(wxSplitterScrolledWindow) DECLARE_DYNAMIC_CLASS(wxSplitterScrolledWindow)