X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4346967a201ce329c1ff17357f5a4d362c30144..09f0f2cf08fd9924c103184c52833146a1d008d4:/include/wx/popupwin.h diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h index 72d822411c..372bf523d4 100644 --- a/include/wx/popupwin.h +++ b/include/wx/popupwin.h @@ -23,7 +23,7 @@ // combobox popups and such. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxPopupWindowBase : public wxNonOwnedWindow +class WXDLLIMPEXP_CORE wxPopupWindowBase : public wxNonOwnedWindow { public: wxPopupWindowBase() { } @@ -69,7 +69,7 @@ public: #elif defined(__WXMGL__) #include "wx/mgl/popupwin.h" #elif defined(__WXMAC__) - #include "wx/mac/popupwin.h" + #include "wx/osx/popupwin.h" #else #error "wxPopupWindow is not supported under this platform." #endif @@ -82,7 +82,7 @@ public: class WXDLLIMPEXP_FWD_CORE wxPopupWindowHandler; class WXDLLIMPEXP_FWD_CORE wxPopupFocusHandler; -class WXDLLEXPORT wxPopupTransientWindow : public wxPopupWindow +class WXDLLIMPEXP_CORE wxPopupTransientWindow : public wxPopupWindow { public: // ctors @@ -129,7 +129,7 @@ protected: // get alerted when child gets deleted from under us void OnDestroy(wxWindowDestroyEvent& event); -#ifdef __WXMSW__ +#if defined( __WXMSW__ ) || defined( __WXMAC__) // check if the mouse needs captured or released void OnIdle(wxIdleEvent& event); #endif @@ -162,7 +162,7 @@ protected: class WXDLLIMPEXP_FWD_CORE wxComboBox; class WXDLLIMPEXP_FWD_CORE wxComboCtrl; -class WXDLLEXPORT wxPopupComboWindow : public wxPopupTransientWindow +class WXDLLIMPEXP_CORE wxPopupComboWindow : public wxPopupTransientWindow { public: wxPopupComboWindow() { m_combo = NULL; }