projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
deprecate wxStringEq
[wxWidgets.git]
/
include
/
wx
/
popupwin.h
diff --git
a/include/wx/popupwin.h
b/include/wx/popupwin.h
index 63c4d65eead6c65a56eec2b5d26406ddfb93d469..372bf523d4a14a75e01b4ad7c56c25aaf7725f81 100644
(file)
--- a/
include/wx/popupwin.h
+++ b/
include/wx/popupwin.h
@@
-6,25
+6,24
@@
// 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_
-#ifdef __GNUG__
- #pragma interface "popupwinbase.h"
-#endif
-
-#include "wx/window.h"
+#include "wx/defs.h"
#if wxUSE_POPUPWIN
#if wxUSE_POPUPWIN
+
+#include "wx/nonownedwnd.h"
+
// ----------------------------------------------------------------------------
// 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.
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT wxPopupWindowBase : public wx
Window
+class WXDLL
IMPEXP_CORE wxPopupWindowBase : public wxNonOwned
Window
{
public:
wxPopupWindowBase() { }
{
public:
wxPopupWindowBase() { }
@@
-45,20
+44,32
@@
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(__WXGTK20__)
#include "wx/gtk/popupwin.h"
#include "wx/gtk/popupwin.h"
-#elif __WXX11__
+#elif defined(__WXGTK__)
+ #include "wx/gtk1/popupwin.h"
+#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(__WXDFB__)
+ #include "wx/dfb/popupwin.h"
+#elif defined(__WXMGL__)
#include "wx/mgl/popupwin.h"
#include "wx/mgl/popupwin.h"
+#elif defined(__WXMAC__)
+ #include "wx/osx/popupwin.h"
#else
#error "wxPopupWindow is not supported under this platform."
#endif
#else
#error "wxPopupWindow is not supported under this platform."
#endif
@@
-68,10
+79,10
@@
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 WXDLL
EXPORT
wxPopupWindowHandler;
-class WXDLL
EXPORT
wxPopupFocusHandler;
+class WXDLL
IMPEXP_FWD_CORE
wxPopupWindowHandler;
+class WXDLL
IMPEXP_FWD_CORE
wxPopupFocusHandler;
-class WXDLL
EXPORT
wxPopupTransientWindow : public wxPopupWindow
+class WXDLL
IMPEXP_CORE
wxPopupTransientWindow : public wxPopupWindow
{
public:
// ctors
{
public:
// ctors
@@
-86,16
+97,21
@@
public:
// hide the window
virtual void Dismiss();
// hide the window
virtual void Dismiss();
-
+ // can the window be dismissed now?
+ //
+ // VZ: where is this used??
virtual bool CanDismiss()
virtual bool CanDismiss()
- { return
TRUE
; }
+ { return
true
; }
- // called when a mouse is pressed while the popup is shown: 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();
@@
-110,6
+126,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);
+
+#if defined( __WXMSW__ ) || defined( __WXMAC__)
+ // 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;
@@
-124,7
+148,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__)
@@
-133,16
+159,16
@@
protected:
// wxPopupComboWindow: wxPopupTransientWindow used by wxComboBox
// ----------------------------------------------------------------------------
// wxPopupComboWindow: wxPopupTransientWindow used by wxComboBox
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxComboBox;
-class WXDLL
EXPORT wxComboContro
l;
+class WXDLL
IMPEXP_FWD_CORE
wxComboBox;
+class WXDLL
IMPEXP_FWD_CORE wxComboCtr
l;
-class WXDLL
EXPORT
wxPopupComboWindow : public wxPopupTransientWindow
+class WXDLL
IMPEXP_CORE
wxPopupComboWindow : public wxPopupTransientWindow
{
public:
wxPopupComboWindow() { m_combo = NULL; }
{
public:
wxPopupComboWindow() { m_combo = NULL; }
- wxPopupComboWindow(wxComboC
ontro
l *parent);
+ wxPopupComboWindow(wxComboC
tr
l *parent);
- bool Create(wxComboC
ontro
l *parent);
+ bool Create(wxComboC
tr
l *parent);
// position the window correctly relatively to the combo
void PositionNearCombo();
// position the window correctly relatively to the combo
void PositionNearCombo();
@@
-155,7
+181,7
@@
protected:
void OnKeyDown(wxKeyEvent& event);
// the parent combobox
void OnKeyDown(wxKeyEvent& event);
// the parent combobox
- wxComboC
ontro
l *m_combo;
+ wxComboC
tr
l *m_combo;
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxPopupComboWindow)
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxPopupComboWindow)
@@
-166,4
+192,3
@@
protected:
#endif // wxUSE_POPUPWIN
#endif // _WX_POPUPWIN_H_BASE_
#endif // wxUSE_POPUPWIN
#endif // _WX_POPUPWIN_H_BASE_
-