projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Applied rowspan patch #15276 (dghart)
[wxWidgets.git]
/
include
/
wx
/
popupwin.h
diff --git
a/include/wx/popupwin.h
b/include/wx/popupwin.h
index 372bf523d4a14a75e01b4ad7c56c25aaf7725f81..3a16fa1b1a82164b54a716322b021996128e235c 100644
(file)
--- a/
include/wx/popupwin.h
+++ b/
include/wx/popupwin.h
@@
-6,7
+6,7
@@
// 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>
-// Licen
s
e: wxWindows licence
+// Licen
c
e: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_POPUPWIN_H_BASE_
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_POPUPWIN_H_BASE_
@@
-47,7
+47,7
@@
public:
virtual bool IsTopLevel() const { return true; }
virtual bool IsTopLevel() const { return true; }
- DECLARE_NO_COPY_CLASS(wxPopupWindowBase)
+ wxDECLARE_NO_COPY_CLASS(wxPopupWindowBase);
};
};
@@
-66,8
+66,6
@@
public:
#include "wx/motif/popupwin.h"
#elif defined(__WXDFB__)
#include "wx/dfb/popupwin.h"
#include "wx/motif/popupwin.h"
#elif defined(__WXDFB__)
#include "wx/dfb/popupwin.h"
-#elif defined(__WXMGL__)
- #include "wx/mgl/popupwin.h"
#elif defined(__WXMAC__)
#include "wx/osx/popupwin.h"
#else
#elif defined(__WXMAC__)
#include "wx/osx/popupwin.h"
#else
@@
-106,12
+104,15
@@
public:
// 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
// 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 c
il
cked outside it)
+ // in dismissing it if the mouse is c
li
cked outside it)
virtual bool ProcessLeftDown(wxMouseEvent& event);
// Overridden to grab the input on some plaforms
virtual bool Show( bool show = true );
virtual bool ProcessLeftDown(wxMouseEvent& event);
// Overridden to grab the input on some plaforms
virtual bool Show( bool show = true );
+ // Override to implement delayed destruction of this window.
+ virtual bool Destroy();
+
protected:
// common part of all ctors
void Init();
protected:
// common part of all ctors
void Init();
@@
-129,8
+130,9
@@
protected:
// get alerted when child gets deleted from under us
void OnDestroy(wxWindowDestroyEvent& event);
// 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
+#if defined(__WXMSW__) ||(defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON)
+ // Check if the mouse needs to be captured or released: we must release
+ // when it's inside our window if we want the embedded controls to work.
void OnIdle(wxIdleEvent& event);
#endif
void OnIdle(wxIdleEvent& event);
#endif
@@
-150,7
+152,7
@@
protected:
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxPopupTransientWindow)
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxPopupTransientWindow)
- DECLARE_NO_COPY_CLASS(wxPopupTransientWindow)
+ wxDECLARE_NO_COPY_CLASS(wxPopupTransientWindow);
};
#if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
};
#if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)