projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pressing build-in joystick on WinCE phones fires wxEVT_JOY_BUTTON_DOWN event.
[wxWidgets.git]
/
include
/
wx
/
popupwin.h
diff --git
a/include/wx/popupwin.h
b/include/wx/popupwin.h
index 27779f34847ad5d66296650589932d7104ce4b73..7a4d3c136b22c253dba967111ee77e55d3425f84 100644
(file)
--- a/
include/wx/popupwin.h
+++ b/
include/wx/popupwin.h
@@
-6,19
+6,18
@@
// Created: 06.01.01
// RCS-ID: $Id$
// Copyright: (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Created: 06.01.01
// RCS-ID: $Id$
// Copyright: (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License: wxWindows licen
s
e
+// License: wxWindows licen
c
e
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_POPUPWIN_H_BASE_
#define _WX_POPUPWIN_H_BASE_
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_POPUPWIN_H_BASE_
#define _WX_POPUPWIN_H_BASE_
-#i
fdef __GNUG__
- #pragma interface "popupwinbase.h"
-#
endif
+#i
nclude "wx/defs.h"
+
+#
if wxUSE_POPUPWIN
#include "wx/window.h"
#include "wx/window.h"
-#if wxUSE_POPUPWIN
// ----------------------------------------------------------------------------
// wxPopupWindow: a special kind of top level window used for popup menus,
// combobox popups and such.
// ----------------------------------------------------------------------------
// wxPopupWindow: a special kind of top level window used for popup menus,
// combobox popups and such.
@@
-45,19
+44,25
@@
public:
// the point must be given in screen coordinates!
virtual void Position(const wxPoint& ptOrigin,
const wxSize& size);
// the point must be given in screen coordinates!
virtual void Position(const wxPoint& ptOrigin,
const wxSize& size);
+
+ virtual bool IsTopLevel() const { return true; }
+
+ DECLARE_NO_COPY_CLASS(wxPopupWindowBase)
};
// include the real class declaration
};
// include the real class declaration
-#if
def __WXMSW__
+#if
defined(__WXMSW__)
#include "wx/msw/popupwin.h"
#include "wx/msw/popupwin.h"
-#elif
__WXPM__
+#elif
defined(__WXPM__)
#include "wx/os2/popupwin.h"
#include "wx/os2/popupwin.h"
-#elif
__WXGTK__
+#elif
defined(__WXGTK__)
#include "wx/gtk/popupwin.h"
#include "wx/gtk/popupwin.h"
-#
ifdef __WXX11__
+#
elif defined(__WXX11__)
#include "wx/x11/popupwin.h"
#include "wx/x11/popupwin.h"
-#elif __WXMGL__
+#elif defined(__WXMOTIF__)
+ #include "wx/motif/popupwin.h"
+#elif defined(__WXMGL__)
#include "wx/mgl/popupwin.h"
#else
#error "wxPopupWindow is not supported under this platform."
#include "wx/mgl/popupwin.h"
#else
#error "wxPopupWindow is not supported under this platform."
@@
-68,6
+73,9
@@
public:
// when the user clicks mouse outside it or if it loses focus in any other way
// ----------------------------------------------------------------------------
// when the user clicks mouse outside it or if it loses focus in any other way
// ----------------------------------------------------------------------------
+class WXDLLEXPORT wxPopupWindowHandler;
+class WXDLLEXPORT wxPopupFocusHandler;
+
class WXDLLEXPORT wxPopupTransientWindow : public wxPopupWindow
{
public:
class WXDLLEXPORT wxPopupTransientWindow : public wxPopupWindow
{
public:
@@
-84,11
+92,20
@@
public:
// hide the window
virtual void Dismiss();
// hide the window
virtual void Dismiss();
- // called when a mouse is pressed while the popup is shown: return TRUE
+ // can the window be dismissed now?
+ //
+ // VZ: where is this used??
+ virtual bool CanDismiss()
+ { return true; }
+
+ // called when a mouse is pressed while the popup is shown: return true
// from here to prevent its normal processing by the popup (which consists
// in dismissing it if the mouse is cilcked outside it)
virtual bool ProcessLeftDown(wxMouseEvent& event);
// from here to prevent its normal processing by the popup (which consists
// in dismissing it if the mouse is cilcked outside it)
virtual bool ProcessLeftDown(wxMouseEvent& event);
+ // Overridden to grab the input on some plaforms
+ virtual bool Show( bool show = true );
+
protected:
// common part of all ctors
void Init();
protected:
// common part of all ctors
void Init();
@@
-103,6
+120,14
@@
protected:
// remove our event handlers
void PopHandlers();
// remove our event handlers
void PopHandlers();
+ // get alerted when child gets deleted from under us
+ void OnDestroy(wxWindowDestroyEvent& event);
+
+#ifdef __WXMSW__
+ // check if the mouse needs captured or released
+ void OnIdle(wxIdleEvent& event);
+#endif
+
// the child of this popup if any
wxWindow *m_child;
// the child of this popup if any
wxWindow *m_child;
@@
-117,7
+142,9
@@
protected:
wxPopupWindowHandler *m_handlerPopup;
wxPopupFocusHandler *m_handlerFocus;
wxPopupWindowHandler *m_handlerPopup;
wxPopupFocusHandler *m_handlerFocus;
+ DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxPopupTransientWindow)
DECLARE_DYNAMIC_CLASS(wxPopupTransientWindow)
+ DECLARE_NO_COPY_CLASS(wxPopupTransientWindow)
};
#if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
};
#if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
@@
-144,9
+171,13
@@
protected:
// notify the combo here
virtual void OnDismiss();
// notify the combo here
virtual void OnDismiss();
+ // forward the key presses to the combobox
+ void OnKeyDown(wxKeyEvent& event);
+
// the parent combobox
wxComboControl *m_combo;
// the parent combobox
wxComboControl *m_combo;
+ DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxPopupComboWindow)
};
DECLARE_DYNAMIC_CLASS(wxPopupComboWindow)
};
@@
-155,4
+186,3
@@
protected:
#endif // wxUSE_POPUPWIN
#endif // _WX_POPUPWIN_H_BASE_
#endif // wxUSE_POPUPWIN
#endif // _WX_POPUPWIN_H_BASE_
-