Remove unnecessary IsRadioButton().

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

diff --git a/src/gtk/filepicker.cpp b/src/gtk/filepicker.cpp
index 01702dd37c195c8b360413e833e6bfe3b303a389..d1f18c726f59c957765e45c860da1f8304273aba 100644 (file)
--- a/src/gtk/filepicker.cpp
+++ b/src/gtk/filepicker.cpp
@@ -46,8 +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 !
 
         // 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;
-

         if (!PreCreation( parent, pos, size ) ||
             !wxControl::CreateBase(parent, id, pos, size, style & wxWINDOW_STYLE_MASK,
                                     validator, name))
         if (!PreCreation( parent, pos, size ) ||
             !wxControl::CreateBase(parent, id, pos, size, style & wxWINDOW_STYLE_MASK,
                                     validator, name))


@@ -107,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
     // 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)
 }
 
 void wxFileButton::OnDialogOK(wxCommandEvent& ev)


@@ -121,14 +120,15 @@ void wxFileButton::OnDialogOK(wxCommandEvent& ev)
 
         // ...and fire an event
         wxFileDirPickerEvent event(wxEVT_COMMAND_FILEPICKER_CHANGED, this, GetId(), m_path);
 
         // ...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;
     }
 }
 
 void wxFileButton::SetPath(const wxString &str)
 {
     m_path = str;

-    UpdateDialogPath(m_dialog);
+    if (m_dialog)
+        UpdateDialogPath(m_dialog);

 }
 
 #endif      // wxUSE_FILEPICKERCTRL && defined(__WXGTK26__)
 }
 
 #endif      // wxUSE_FILEPICKERCTRL && defined(__WXGTK26__)


@@ -172,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());
 
     // ...and fire an event
     wxFileDirPickerEvent event(wxEVT_COMMAND_DIRPICKER_CHANGED, p, p->GetId(), p->GetPath());

-    p->GetEventHandler()->ProcessEvent(event);
+    p->HandleWindowEvent(event);

 }
 }
 
 }
 }
 


@@ -195,8 +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 !
 
         // 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;
-

         if (!PreCreation( parent, pos, size ) ||
             !wxControl::CreateBase(parent, id, pos, size, style & wxWINDOW_STYLE_MASK,
                                     validator, name))
         if (!PreCreation( parent, pos, size ) ||
             !wxControl::CreateBase(parent, id, pos, size, style & wxWINDOW_STYLE_MASK,
                                     validator, name))


@@ -253,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
     // 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)
 }
 
 void wxDirButton::SetPath(const wxString &str)


@@ -267,7 +266,8 @@ void wxDirButton::SetPath(const wxString &str)
     // general with all wxWidgets control-manipulation functions which do not send events).
     m_bIgnoreNextChange = true;
 
     // 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__)
 }
 
 #endif      // wxUSE_DIRPICKERCTRL && defined(__WXGTK26__)