X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83df96d63a52ebb08b9e32549dc255354b4a18d0..51623cc53f350935337e57930eaaf1afe9a48c3b:/include/wx/x11/popupwin.h?ds=sidebyside diff --git a/include/wx/x11/popupwin.h b/include/wx/x11/popupwin.h index 239ee04212..28a423dd41 100644 --- a/include/wx/x11/popupwin.h +++ b/include/wx/x11/popupwin.h @@ -1,50 +1,46 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/msw/popupwin.h -// Purpose: wxPopupWindow class for wxMSW -// Author: Vadim Zeitlin -// Modified by: -// Created: 06.01.01 -// RCS-ID: $Id$ -// Copyright: (c) 2001 Vadim Zeitlin +///////////////////////////////////////////////////////////////////////////// +// Name: wx/x11/popupwin.h +// Purpose: +// Author: Robert Roebling +// Created: +// Id: $Id$ +// Copyright: (c) 2001 Robert Roebling // Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////// -#ifndef _WX_MSW_POPUPWIN_H_ -#define _WX_MSW_POPUPWIN_H_ +#ifndef __GTKPOPUPWINH__ +#define __GTKPOPUPWINH__ -// ---------------------------------------------------------------------------- -// wxPopupWindow -// ---------------------------------------------------------------------------- +#include "wx/defs.h" +#include "wx/panel.h" +#include "wx/icon.h" -class WXDLLEXPORT wxPopupWindow : public wxPopupWindowBase +//----------------------------------------------------------------------------- +// wxPopUpWindow +//----------------------------------------------------------------------------- + +class WXDLLIMPEXP_CORE wxPopupWindow: public wxPopupWindowBase { public: wxPopupWindow() { } + virtual ~wxPopupWindow() ; wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE) { (void)Create(parent, flags); } - bool Create(wxWindow *parent, int flags = wxBORDER_NONE) - { - return wxPopupWindowBase::Create(parent) && - wxWindow::Create(parent, -1, - wxDefaultPosition, wxDefaultSize, - (flags & wxBORDER_MASK) | wxPOPUP_WINDOW); - } + bool Create(wxWindow *parent, int flags = wxBORDER_NONE); -protected: - virtual void DoGetPosition(int *x, int *y) const - { - // the position of a "top level" window such as this should be in - // screen coordinates, not in the client ones which MSW gives us - // (because we are a child window) - wxPopupWindowBase::DoGetPosition(x, y); + virtual bool Show( bool show = TRUE ); - GetParent()->ClientToScreen(x, y); - } +protected: + virtual void DoMoveWindow(int x, int y, int width, int height); + virtual void DoSetSize(int x, int y, + int width, int height, + int sizeFlags = wxSIZE_AUTO); +private: + DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxPopupWindow) }; -#endif // _WX_MSW_POPUPWIN_H_ - +#endif // __GTKPOPUPWINDOWH__