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

Don't free a string that is managed by wxGtkString, that's the whole _point_ of wxGtkString.

Browse Source 
While we're at it, lets use it some more.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2006-10-03 16:01:18 +00:00
parent baa9ebc473
commit e808cf8a0a
7 changed files with 34 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/gtk/dirdlg.cpp
View File

@@ -29,18 +29,10 @@
#include "wx/filedlg.h"
#endif
#include <gtk/gtk.h>
#include "wx/gtk/private.h"
#include <unistd.h> // chdir
//-----------------------------------------------------------------------------
// idle system
//-----------------------------------------------------------------------------
extern void wxapp_install_idle_handler();
//-----------------------------------------------------------------------------
// "clicked" for OK-button
//-----------------------------------------------------------------------------
@@ -48,13 +40,12 @@ extern void wxapp_install_idle_handler();
extern "C" {
static void gtk_dirdialog_ok_callback(GtkWidget *widget, wxDirDialog *dialog)
{
gchar* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));
// change to the directory where the user went if asked
if (dialog->HasFlag(wxDD_CHANGE_DIR))
{
wxGtkString filename(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget)));
chdir(filename);
g_free(filename);
}
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
event.SetEventObject(dialog);
@@ -213,14 +204,11 @@ wxString wxDirDialog::GetPath() const
{
if (!gtk_check_version(2,4,0))
{
gchar *str = gtk_file_chooser_get_filename( GTK_FILE_CHOOSER(m_widget) );
wxString ret = wxConvFileName->cMB2WX(str);
if (str) g_free(str);
return ret;
wxGtkString str(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(m_widget)));
return wxConvFileName->cMB2WX(str);
}
else
return wxGenericDirDialog::GetPath();
return wxGenericDirDialog::GetPath();
}
#endif // wxUSE_DIRDLG