Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't destroy the native window in wxNativeWindow itself by default

Browse Source 
Leave ownership of the native window to the user code as it may want to reuse
it for some other purpose and provide an explicit Disown() function that can
be called if the user really wants wxWidgets to take ownership of the native
window.

In particular, this avoids problems when using ARC under OS X which resulted
in a double "release" before.
This commit is contained in:
Vadim Zeitlin
2015-11-10 16:09:21 +01:00
parent 359f4e21be
commit cb26668204
6 changed files with 120 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
interface/wx/nativewin.h
View File

@@ -15,8 +15,8 @@
This class can be used as a bridge between wxWidgets and native GUI
toolkit, i.e. standard Windows controls under MSW, GTK+ widgets or Cocoa
views. Using it involves writing code specific to each platform, at the
very least for creating the native window, but possibly also to handle its
events, but this class takes care of all the generic parts.
very least for creating and destroying the native window, but possibly also
to handle its events, but this class takes care of all the generic parts.
@note Check whether @c wxHAS_NATIVE_WINDOW is defined before using this
class as it is not available under all platforms.
@@ -26,14 +26,24 @@
@code
#include <wx/nativewin.h>
wxNativeWindow* switch = new wxNativeWindow(parent, wxID_ANY, gtk_switch_new());
GtkWidget* w = gtk_switch_new();
wxNativeWindow* switch = new wxNativeWindow(parent, wxID_ANY, w);
g_object_unref(w);
@endcode
and then use @c switch as usual, e.g. add it to a sizer to layout it
correctly. Of course, you will still have to use the native GTK+ functions
to handle its events and change or retrieve its state.
See the "native" page of the widgets sample for another example of using
it.
Notice that the native window still remains owned by the caller, to allow
reusing it later independently of wxWidgets. If you want wxWidgets to
delete the native window when the wxNativeWindow itself is destroyed, you
need to explicitly call Disown(). Otherwise you need to perform the
necessary cleanup in your own code by calling the appropriate
platform-specific function: under MSW, this is @c ::DestroyWindow(), under
GTK @c g_object_unref() and under Cocoa -- @c -release:.
See the "native" page of the widgets sample for the examples of using
this class under all major platforms.
@since 3.1.0
@@ -76,4 +86,12 @@ public:
typically because the supplied parameters are invalid.
*/
bool Create(wxWindow* parent, wxWindowID winid, wxNativeWindowHandle handle);
/**
Indicate that the user code yields ownership of the native window.
This method can be called at most once and after calling it, the native
window will be destroyed when this wxNativeWindow object is.
*/
void Disown();
};