X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1be7a35c5ec31b6cfcab9d969c7969586441a945..558820fd083635d3e1dc026a56b2f14870cb5c38:/include/wx/popupwin.h diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h index dabd5c8063..dc2ede540f 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() { } @@ -64,6 +64,8 @@ public: #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" #else @@ -75,8 +77,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 { @@ -155,16 +157,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(); @@ -177,7 +179,7 @@ protected: void OnKeyDown(wxKeyEvent& event); // the parent combobox - wxComboControl *m_combo; + wxComboCtrl *m_combo; DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxPopupComboWindow)