X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/414f2513fc42e1ec60954c7c000d7ae78ba6af8c..bc07ab17bf5370f452e899128bf89cc7ca7b98f0:/include/wx/popupwin.h?ds=inline diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h index a347db9dc6..c8adb53e31 100644 --- a/include/wx/popupwin.h +++ b/include/wx/popupwin.h @@ -12,10 +12,6 @@ #ifndef _WX_POPUPWIN_H_BASE_ #define _WX_POPUPWIN_H_BASE_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "popupwinbase.h" -#endif - #include "wx/defs.h" #if wxUSE_POPUPWIN @@ -56,17 +52,19 @@ public: // include the real class declaration -#ifdef __WXMSW__ +#if defined(__WXMSW__) #include "wx/msw/popupwin.h" -#elif __WXPM__ +#elif defined(__WXPM__) #include "wx/os2/popupwin.h" -#elif __WXGTK__ +#elif defined(__WXGTK20__) #include "wx/gtk/popupwin.h" -#elif __WXX11__ +#elif defined(__WXGTK__) + #include "wx/gtk1/popupwin.h" +#elif defined(__WXX11__) #include "wx/x11/popupwin.h" -#elif __WXMOTIF__ +#elif defined(__WXMOTIF__) #include "wx/motif/popupwin.h" -#elif __WXMGL__ +#elif defined(__WXMGL__) #include "wx/mgl/popupwin.h" #else #error "wxPopupWindow is not supported under this platform." @@ -131,7 +129,7 @@ protected: // check if the mouse needs captured or released void OnIdle(wxIdleEvent& event); #endif - + // the child of this popup if any wxWindow *m_child; @@ -158,15 +156,15 @@ protected: // ---------------------------------------------------------------------------- class WXDLLEXPORT wxComboBox; -class WXDLLEXPORT wxComboControl; +class WXDLLEXPORT wxComboCtrl; class WXDLLEXPORT wxPopupComboWindow : public wxPopupTransientWindow { public: wxPopupComboWindow() { m_combo = NULL; } - wxPopupComboWindow(wxComboControl *parent); + wxPopupComboWindow(wxComboCtrl *parent); - bool Create(wxComboControl *parent); + bool Create(wxComboCtrl *parent); // position the window correctly relatively to the combo void PositionNearCombo(); @@ -179,7 +177,7 @@ protected: void OnKeyDown(wxKeyEvent& event); // the parent combobox - wxComboControl *m_combo; + wxComboCtrl *m_combo; DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxPopupComboWindow) @@ -190,4 +188,3 @@ protected: #endif // wxUSE_POPUPWIN #endif // _WX_POPUPWIN_H_BASE_ -