Update OpenVMS compile support

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

diff --git a/src/gtk/filepicker.cpp b/src/gtk/filepicker.cpp
index 6779e751117164ef3de7ba3cc8aa2b5e703d253a..fffa3b0da9bce15c2c73c2ecef80011fbfad6e6a 100644 (file)
--- a/src/gtk/filepicker.cpp
+++ b/src/gtk/filepicker.cpp
@@ -22,9 +22,7 @@
 #include "wx/filepicker.h"
 #include "wx/tooltip.h"
 
 #include "wx/filepicker.h"
 #include "wx/tooltip.h"
 

-#include <gtk/gtk.h>
-
-
+#include "wx/gtk/private.h"

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -43,14 +41,13 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
                         long style, const wxValidator& validator,
                         const wxString &name )
 {
                         long style, const wxValidator& validator,
                         const wxString &name )
 {

-    if (!gtk_check_version(2,6,0))
+    // we can't use the native button for wxFLP_SAVE pickers as it can only
+    // open existing files and there is no way to create a new file using it
+    if ( !(style & wxFLP_SAVE) && !gtk_check_version(2,6,0) )

     {
         // 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;
-        m_acceptsFocus = 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))


@@ -84,7 +81,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 );
         // 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
 
         // we need to know when the dialog has been dismissed clicking OK...
         // NOTE: the "clicked" signal is not available for a GtkFileChooserButton


@@ -96,7 +93,7 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
         m_parent->DoAddChild( this );
 
         PostCreation(size);
         m_parent->DoAddChild( this );
 
         PostCreation(size);

-        SetBestSize(size);
+        SetInitialSize(size);

     }
     else
         return wxGenericFileButton::Create(parent, id, label, path, message, wildcard,
     }
     else
         return wxGenericFileButton::Create(parent, id, label, path, message, wildcard,


@@ -110,7 +107,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)


@@ -124,14 +122,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__)


@@ -162,7 +161,7 @@ static void gtk_dirbutton_currentfolderchanged_callback(GtkFileChooserButton *wi
 
     // NB: it's important to use gtk_file_chooser_get_filename instead of
     //     gtk_file_chooser_get_current_folder (see GTK docs) !
 
     // NB: it's important to use gtk_file_chooser_get_filename instead of
     //     gtk_file_chooser_get_current_folder (see GTK docs) !

-    gchar* filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));
+    wxGtkString filename(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget)));

     p->UpdatePath(filename);
 
     // since GtkFileChooserButton when used to pick directories also uses a combobox,
     p->UpdatePath(filename);
 
     // since GtkFileChooserButton when used to pick directories also uses a combobox,


@@ -172,11 +171,10 @@ static void gtk_dirbutton_currentfolderchanged_callback(GtkFileChooserButton *wi
     // style was given.
     if (p->HasFlag(wxDIRP_CHANGE_DIR))
         chdir(filename);
     // style was given.
     if (p->HasFlag(wxDIRP_CHANGE_DIR))
         chdir(filename);

-    g_free(filename);

 
     // ...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);

 }
 }
 
 }
 }
 


@@ -199,9 +197,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;
-        m_acceptsFocus = 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))


@@ -235,7 +230,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 );
 
         //       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",
 
         // GtkFileChooserButton signals
         g_signal_connect(m_widget, "current-folder-changed",


@@ -244,7 +239,7 @@ bool wxDirButton::Create( wxWindow *parent, wxWindowID id,
         m_parent->DoAddChild( this );
 
         PostCreation(size);
         m_parent->DoAddChild( this );
 
         PostCreation(size);

-        SetBestSize(size);
+        SetInitialSize(size);

     }
     else
         return wxGenericDirButton::Create(parent, id, label, path, message, wildcard,
     }
     else
         return wxGenericDirButton::Create(parent, id, label, path, message, wildcard,


@@ -258,7 +253,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)


@@ -272,7 +268,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__)