projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add wxLoadUserResource() overload not copying the resource data.
[wxWidgets.git]
/
include
/
wx
/
gtk
/
popupwin.h
diff --git
a/include/wx/gtk/popupwin.h
b/include/wx/gtk/popupwin.h
index 40ad14d7465c42a2ba9276d29e5b44a7aed2b00e..ecc2e52679b2bbb3e8355e8adfeccf9449142aa7 100644
(file)
--- a/
include/wx/gtk/popupwin.h
+++ b/
include/wx/gtk/popupwin.h
@@
-8,22
+8,14
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifndef __GTKPOPUPWINH__
-#define __GTKPOPUPWINH__
-
-#ifdef __GNUG__
- #pragma interface "popupwin.h"
-#endif
-
-#include "wx/defs.h"
-#include "wx/panel.h"
-#include "wx/icon.h"
+#ifndef _WX_GTK_POPUPWIN_H_
+#define _WX_GTK_POPUPWIN_H_
//-----------------------------------------------------------------------------
// wxPopUpWindow
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// wxPopUpWindow
//-----------------------------------------------------------------------------
-class wxPopupWindow: public wxPopupWindowBase
+class
WXDLLIMPEXP_CORE
wxPopupWindow: public wxPopupWindowBase
{
public:
wxPopupWindow() { }
{
public:
wxPopupWindow() { }
@@
-33,26
+25,30
@@
public:
{ (void)Create(parent, flags); }
bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
{ (void)Create(parent, flags); }
bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
- virtual bool Show( bool show = TRUE );
+ virtual bool Show(bool show = true);
+
+ virtual void SetFocus();
// implementation
// --------------
// implementation
// --------------
- virtual void DoMoveWindow(int x, int y, int width, int height);
-
- virtual void OnInternalIdle();
-
+ // GTK time when connecting to button_press signal
+ wxUint32 m_time;
protected:
protected:
- void GtkOnSize( int x, int y, int width, int height );
-
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
+ virtual void DoMoveWindow(int x, int y, int width, int height);
+
private:
private:
+ virtual void AddChildGTK(wxWindowGTK* child);
+
+#ifdef __WXUNIVERSAL__
DECLARE_EVENT_TABLE()
DECLARE_EVENT_TABLE()
+#endif
DECLARE_DYNAMIC_CLASS(wxPopupWindow)
};
DECLARE_DYNAMIC_CLASS(wxPopupWindow)
};
-#endif // _
_GTKPOPUPWINDOWH_
_
+#endif // _
WX_GTK_POPUPWIN_H
_