USE_xxx constants renamed to wxUSE_xxx. This is an incompatible change, you
must recompile everything after upgrading! git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -67,11 +67,11 @@ class WXDLLEXPORT wxIcon;
|
||||
class WXDLLEXPORT wxDC;
|
||||
class WXDLLEXPORT wxValidator;
|
||||
|
||||
#if USE_DRAG_AND_DROP
|
||||
#if wxUSE_DRAG_AND_DROP
|
||||
class WXDLLEXPORT wxDropTarget;
|
||||
#endif
|
||||
|
||||
#if USE_WX_RESOURCES
|
||||
#if wxUSE_WX_RESOURCES
|
||||
class WXDLLEXPORT wxResourceTable;
|
||||
class WXDLLEXPORT wxItemResource;
|
||||
#endif
|
||||
@@ -193,7 +193,7 @@ public:
|
||||
// Enable or disable the window
|
||||
virtual void Enable(bool enable);
|
||||
|
||||
#if USE_DRAG_AND_DROP
|
||||
#if wxUSE_DRAG_AND_DROP
|
||||
// Associate a drop target with this window (if the window already had a drop
|
||||
// target, it's deleted!) and return the current drop target (may be NULL).
|
||||
void SetDropTarget(wxDropTarget *pDropTarget);
|
||||
@@ -357,7 +357,7 @@ public:
|
||||
virtual void OnDefaultAction(wxControl *initiatingItem);
|
||||
|
||||
// Resource loading
|
||||
#if USE_WX_RESOURCES
|
||||
#if wxUSE_WX_RESOURCES
|
||||
virtual bool LoadFromResource(wxWindow *parent, const wxString& resourceName, const wxResourceTable *table = NULL);
|
||||
virtual wxControl *CreateItem(const wxItemResource *childResource, const wxResourceTable *table = NULL);
|
||||
#endif
|
||||
@@ -633,7 +633,7 @@ protected:
|
||||
bool m_winCaptured;
|
||||
wxString m_windowName; // Window name
|
||||
|
||||
#if USE_EXTENDED_STATICS
|
||||
#if wxUSE_EXTENDED_STATICS
|
||||
wxList m_staticItems;
|
||||
#endif
|
||||
|
||||
@@ -656,7 +656,7 @@ protected:
|
||||
|
||||
bool m_mouseInWindow;
|
||||
|
||||
#if USE_DRAG_AND_DROP
|
||||
#if wxUSE_DRAG_AND_DROP
|
||||
wxDropTarget *m_pDropTarget; // the current drop target or NULL
|
||||
#endif //USE_DRAG_AND_DROP
|
||||
|
||||
|
Reference in New Issue
Block a user