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

universal os x fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@46432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2007-06-13 03:46:20 +00:00
parent 50af8f6e66
commit cc10fcc4a8
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/generic/listctrl.h
View File

@@ -252,7 +252,7 @@ private:
DECLARE_DYNAMIC_CLASS(wxGenericListCtrl) DECLARE_DYNAMIC_CLASS(wxGenericListCtrl)
}; };
#if (!defined(__WXMSW__) || defined(__WXUNIVERSAL__)) && !defined(__WXMAC__) #if (!defined(__WXMSW__) || defined(__WXUNIVERSAL__)) && (!defined(__WXMAC__) || defined(__WXUNIVERSAL__))
/* /*
* wxListCtrl has to be a real class or we have problems with * wxListCtrl has to be a real class or we have problems with
* the run-time information. * the run-time information.

2
include/wx/listctrl.h
View File

@@ -30,7 +30,7 @@ extern WXDLLEXPORT_DATA(const wxChar) wxListCtrlNameStr[];
#if defined(__WIN32__) && !defined(__WXUNIVERSAL__) #if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
#include "wx/msw/listctrl.h" #include "wx/msw/listctrl.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__)
#include "wx/mac/carbon/listctrl.h" #include "wx/mac/carbon/listctrl.h"
#else #else
#include "wx/generic/listctrl.h" #include "wx/generic/listctrl.h"

2
include/wx/popupwin.h
View File

@@ -66,6 +66,8 @@ public:
#include "wx/motif/popupwin.h" #include "wx/motif/popupwin.h"
#elif defined(__WXMGL__) #elif defined(__WXMGL__)
#include "wx/mgl/popupwin.h" #include "wx/mgl/popupwin.h"
#elif defined(__WXMAC__)
#include "wx/mac/popupwin.h"
#else #else
#error "wxPopupWindow is not supported under this platform." #error "wxPopupWindow is not supported under this platform."
#endif #endif