check that the version of __sync_sub_and_fetch that returns a value is supported...

[wxWidgets.git] / src / gtk / filepicker.cpp

diff --git a/src/gtk/filepicker.cpp b/src/gtk/filepicker.cpp
index cec62bdeb1333320800cf895ba9cbaa8189c0750..d1f18c726f59c957765e45c860da1f8304273aba 100644 (file)
--- a/src/gtk/filepicker.cpp
+++ b/src/gtk/filepicker.cpp
@@ -46,9 +46,6 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
         // VERY IMPORTANT: this code is identic to relative code in wxDirButton;
         //                 if you find a problem here, fix it also in wxDirButton !
 
-        m_needParent = true;
-        m_acceptsFocus = true;
-
         if (!PreCreation( parent, pos, size ) ||
             !wxControl::CreateBase(parent, id, pos, size, style & wxWINDOW_STYLE_MASK,
                                     validator, name))
@@ -82,7 +79,7 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
         // NOTE: we deliberately ignore the given label as GtkFileChooserButton
         //       use as label the currently selected file
         m_widget = gtk_file_chooser_button_new_with_dialog( m_dialog->m_widget );
-        gtk_widget_show( GTK_WIDGET(m_widget) );
+        gtk_widget_show(m_widget);
 
         // we need to know when the dialog has been dismissed clicking OK...
         // NOTE: the "clicked" signal is not available for a GtkFileChooserButton
@@ -94,7 +91,7 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
         m_parent->DoAddChild( this );
 
         PostCreation(size);
-        SetBestSize(size);
+        SetInitialSize(size);
     }
     else
         return wxGenericFileButton::Create(parent, id, label, path, message, wildcard,
@@ -108,7 +105,8 @@ wxFileButton::~wxFileButton()
     // GtkFileChooserDialog associated with m_dialog.
     // Thus we have to set its m_widget to NULL to avoid
     // double destruction on same widget
-    m_dialog->m_widget = NULL;
+    if (m_dialog)
+        m_dialog->m_widget = NULL;
 }
 
 void wxFileButton::OnDialogOK(wxCommandEvent& ev)
@@ -122,14 +120,15 @@ void wxFileButton::OnDialogOK(wxCommandEvent& ev)
 
         // ...and fire an event
         wxFileDirPickerEvent event(wxEVT_COMMAND_FILEPICKER_CHANGED, this, GetId(), m_path);
-        GetEventHandler()->ProcessEvent(event);
+        HandleWindowEvent(event);
     }
 }
 
 void wxFileButton::SetPath(const wxString &str)
 {
     m_path = str;
-    UpdateDialogPath(m_dialog);
+    if (m_dialog)
+        UpdateDialogPath(m_dialog);
 }
 
 #endif      // wxUSE_FILEPICKERCTRL && defined(__WXGTK26__)
@@ -173,7 +172,7 @@ static void gtk_dirbutton_currentfolderchanged_callback(GtkFileChooserButton *wi
 
     // ...and fire an event
     wxFileDirPickerEvent event(wxEVT_COMMAND_DIRPICKER_CHANGED, p, p->GetId(), p->GetPath());
-    p->GetEventHandler()->ProcessEvent(event);
+    p->HandleWindowEvent(event);
 }
 }
 
@@ -196,9 +195,6 @@ bool wxDirButton::Create( wxWindow *parent, wxWindowID id,
         // VERY IMPORTANT: this code is identic to relative code in wxFileButton;
         //                 if you find a problem here, fix it also in wxFileButton !
 
-        m_needParent = true;
-        m_acceptsFocus = true;
-
         if (!PreCreation( parent, pos, size ) ||
             !wxControl::CreateBase(parent, id, pos, size, style & wxWINDOW_STYLE_MASK,
                                     validator, name))
@@ -232,7 +228,7 @@ bool wxDirButton::Create( wxWindow *parent, wxWindowID id,
         //       use as label the currently selected file
         m_widget = gtk_file_chooser_button_new_with_dialog( m_dialog->m_widget );
 
-        gtk_widget_show( GTK_WIDGET(m_widget) );
+        gtk_widget_show(m_widget);
 
         // GtkFileChooserButton signals
         g_signal_connect(m_widget, "current-folder-changed",
@@ -241,7 +237,7 @@ bool wxDirButton::Create( wxWindow *parent, wxWindowID id,
         m_parent->DoAddChild( this );
 
         PostCreation(size);
-        SetBestSize(size);
+        SetInitialSize(size);
     }
     else
         return wxGenericDirButton::Create(parent, id, label, path, message, wildcard,
@@ -255,7 +251,8 @@ wxDirButton::~wxDirButton()
     // GtkFileChooserDialog associated with m_dialog.
     // Thus we have to set its m_widget to NULL to avoid
     // double destruction on same widget
-    m_dialog->m_widget = NULL;
+    if (m_dialog)
+        m_dialog->m_widget = NULL;
 }
 
 void wxDirButton::SetPath(const wxString &str)
@@ -269,7 +266,8 @@ void wxDirButton::SetPath(const wxString &str)
     // general with all wxWidgets control-manipulation functions which do not send events).
     m_bIgnoreNextChange = true;
 
-    UpdateDialogPath(m_dialog);
+    if (m_dialog)
+        UpdateDialogPath(m_dialog);
 }
 
 #endif      // wxUSE_DIRPICKERCTRL && defined(__WXGTK26__)