X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..19c4d91638c2546630c4427e39c02f5380a8bb87:/include/wx/popupwin.h?ds=sidebyside diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h index 7a4d3c136b..72d822411c 100644 --- a/include/wx/popupwin.h +++ b/include/wx/popupwin.h @@ -16,14 +16,14 @@ #if wxUSE_POPUPWIN -#include "wx/window.h" +#include "wx/nonownedwnd.h" // ---------------------------------------------------------------------------- // wxPopupWindow: a special kind of top level window used for popup menus, // combobox popups and such. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxPopupWindowBase : public wxWindow +class WXDLLEXPORT wxPopupWindowBase : public wxNonOwnedWindow { public: wxPopupWindowBase() { } @@ -56,14 +56,20 @@ public: #include "wx/msw/popupwin.h" #elif defined(__WXPM__) #include "wx/os2/popupwin.h" -#elif defined(__WXGTK__) +#elif defined(__WXGTK20__) #include "wx/gtk/popupwin.h" +#elif defined(__WXGTK__) + #include "wx/gtk1/popupwin.h" #elif defined(__WXX11__) #include "wx/x11/popupwin.h" #elif defined(__WXMOTIF__) #include "wx/motif/popupwin.h" +#elif defined(__WXDFB__) + #include "wx/dfb/popupwin.h" #elif defined(__WXMGL__) #include "wx/mgl/popupwin.h" +#elif defined(__WXMAC__) + #include "wx/mac/popupwin.h" #else #error "wxPopupWindow is not supported under this platform." #endif @@ -73,8 +79,8 @@ public: // when the user clicks mouse outside it or if it loses focus in any other way // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxPopupWindowHandler; -class WXDLLEXPORT wxPopupFocusHandler; +class WXDLLIMPEXP_FWD_CORE wxPopupWindowHandler; +class WXDLLIMPEXP_FWD_CORE wxPopupFocusHandler; class WXDLLEXPORT wxPopupTransientWindow : public wxPopupWindow { @@ -153,16 +159,16 @@ protected: // wxPopupComboWindow: wxPopupTransientWindow used by wxComboBox // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxComboBox; -class WXDLLEXPORT wxComboControl; +class WXDLLIMPEXP_FWD_CORE wxComboBox; +class WXDLLIMPEXP_FWD_CORE 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(); @@ -175,7 +181,7 @@ protected: void OnKeyDown(wxKeyEvent& event); // the parent combobox - wxComboControl *m_combo; + wxComboCtrl *m_combo; DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxPopupComboWindow)