Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

a better compilation fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-30 22:23:22 +00:00
parent 14f4cead9d
commit d34ad9ea89
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/collpane.h
View File

@@ -95,11 +95,10 @@ typedef void (wxEvtHandler::*wxCollapsiblePaneEventFunction)(wxCollapsiblePaneEv
#else #else
#include "wx/generic/collpaneg.h" #include "wx/generic/collpaneg.h"
// use a typedef and not a #define to avoid problems with XRC forward declarations // use #define and not a typedef to allow forward declaring the class
typedef wxGenericCollapsiblePane wxCollapsiblePane; #define wxCollapsiblePane wxGenericCollapsiblePane
#endif #endif
#endif // wxUSE_COLLPANE #endif // wxUSE_COLLPANE
#endif #endif // _WX_COLLAPSABLE_PANE_H_BASE_
// _WX_COLLAPSABLE_PANE_H_BASE_

6
include/wx/xrc/xh_collpane.h
View File

@@ -15,12 +15,10 @@
#if wxUSE_XRC && wxUSE_COLLPANE #if wxUSE_XRC && wxUSE_COLLPANE
#include "wx/collpane.h" class WXDLLIMPEXP_ADV wxCollapsiblePane;
class WXDLLIMPEXP_XRC wxCollapsiblePaneXmlHandler : public wxXmlResourceHandler class WXDLLIMPEXP_XRC wxCollapsiblePaneXmlHandler : public wxXmlResourceHandler
{ {
DECLARE_DYNAMIC_CLASS(wxCollapsiblePaneXmlHandler)
public: public:
wxCollapsiblePaneXmlHandler(); wxCollapsiblePaneXmlHandler();
virtual wxObject *DoCreateResource(); virtual wxObject *DoCreateResource();
@@ -29,6 +27,8 @@ public:
private: private:
bool m_isInside; bool m_isInside;
wxCollapsiblePane *m_collpane; wxCollapsiblePane *m_collpane;
DECLARE_DYNAMIC_CLASS(wxCollapsiblePaneXmlHandler)
}; };
#endif // wxUSE_XRC && wxUSE_COLLPANE #endif // wxUSE_XRC && wxUSE_COLLPANE

6
src/xrc/xh_collpane.cpp
View File

@@ -17,8 +17,12 @@
#if wxUSE_XRC && wxUSE_COLLPANE #if wxUSE_XRC && wxUSE_COLLPANE
#ifndef WX_PRECOMP
#include "wx/log.h"
#endif
#include "wx/collpane.h"
#include "wx/xrc/xh_collpane.h" #include "wx/xrc/xh_collpane.h"
#include "wx/log.h"
IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneXmlHandler, wxXmlResourceHandler) IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneXmlHandler, wxXmlResourceHandler)