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

Use wxGtkObject RAII wrapper for GtkListStore

Browse Source 
Prefer RAII wrapper class to manual g_object_unref() calls.
This commit is contained in:
Vadim Zeitlin
2018-01-27 00:24:58 +01:00
parent f354b0a1b5
commit 96308f0534
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gtk/textentry.cpp
View File

@@ -35,6 +35,7 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "wx/gtk/private.h" #include "wx/gtk/private.h"
#include "wx/gtk/private/gtk2-compat.h" #include "wx/gtk/private/gtk2-compat.h"
#include "wx/gtk/private/object.h"
#include "wx/gtk/private/string.h" #include "wx/gtk/private/string.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -231,7 +232,7 @@ public:
DoEnableCompletion(); DoEnableCompletion();
GtkListStore * const store = gtk_list_store_new (1, G_TYPE_STRING); wxGtkObject<GtkListStore> store(gtk_list_store_new (1, G_TYPE_STRING));
for ( wxArrayString::const_iterator i = strings.begin(); for ( wxArrayString::const_iterator i = strings.begin();
i != strings.end(); i != strings.end();
@@ -241,7 +242,6 @@ public:
} }
UseModel(store); UseModel(store);
g_object_unref (store);
} }
// Takes ownership of the pointer if it is non-NULL. // Takes ownership of the pointer if it is non-NULL.
@@ -392,7 +392,7 @@ private:
if ( m_completer->Start(prefix) ) if ( m_completer->Start(prefix) )
{ {
GtkListStore * const store = gtk_list_store_new (1, G_TYPE_STRING); wxGtkObject<GtkListStore> store(gtk_list_store_new (1, G_TYPE_STRING));
for (;;) for (;;)
{ {
@@ -404,7 +404,6 @@ private:
} }
UseModel(store); UseModel(store);
g_object_unref (store);
m_newCompletionsNeeded = false; m_newCompletionsNeeded = false;
} }