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

Dispose of GtkWidgets used by wxSystemSettings

Browse Source
This commit is contained in:
Paul Cornett
2016-12-17 10:24:29 -08:00
parent fbbc2170a6
commit 4691926791
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gtk/settings.cpp
View File

@@ -33,14 +33,16 @@ bool wxGetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int*
static wxFont gs_fontSystem; static wxFont gs_fontSystem;
#ifndef __WXGTK3__ #ifndef __WXGTK3__
static GtkWidget* gs_tlw_parent;
static GtkContainer* ContainerWidget() static GtkContainer* ContainerWidget()
{ {
static GtkContainer* s_widget; static GtkContainer* s_widget;
if (s_widget == NULL) if (s_widget == NULL)
{ {
s_widget = GTK_CONTAINER(gtk_fixed_new()); s_widget = GTK_CONTAINER(gtk_fixed_new());
GtkWidget* window = gtk_window_new(GTK_WINDOW_TOPLEVEL); gs_tlw_parent = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(s_widget)); gtk_container_add(GTK_CONTAINER(gs_tlw_parent), GTK_WIDGET(s_widget));
} }
return s_widget; return s_widget;
} }
@@ -1010,7 +1012,6 @@ bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
} }
} }
#ifdef __WXGTK3__
class wxSystemSettingsModule: public wxModule class wxSystemSettingsModule: public wxModule
{ {
public: public:
@@ -1022,5 +1023,9 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxSystemSettingsModule, wxModule);
void wxSystemSettingsModule::OnExit() void wxSystemSettingsModule::OnExit()
{ {
} #ifdef __WXGTK3__
#else
if (gs_tlw_parent)
gtk_widget_destroy(gs_tlw_parent);
#endif #endif
}