#include "wx/intl.h"
#include "wx/generic/msgdlgg.h"
-#include "gtk/gtk.h"
+
+#include <gtk/gtk.h>
+
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
//-----------------------------------------------------------------------------
// "delete_event"
static
bool gtk_filedialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
{
+ if (g_isIdle) wxapp_install_idle_handler();
+
/*
printf( "OnDelete from " );
if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
static
void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFileDialog *dialog )
{
+ if (g_isIdle) wxapp_install_idle_handler();
+
int style = dialog->GetStyle();
GtkFileSelection *filedlg = GTK_FILE_SELECTION(dialog->m_widget);
static
void gtk_filedialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFileDialog *dialog )
{
+ if (g_isIdle) wxapp_install_idle_handler();
+
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
event.SetEventObject( dialog );
dialog->GetEventHandler()->ProcessEvent( event );
{
m_needParent = FALSE;
- PreCreation( parent, -1, pos, wxDefaultSize, style | wxDIALOG_MODAL, "filedialog" );
+ if (!PreCreation( parent, pos, wxDefaultSize ) ||
+ !CreateBase( parent, -1, pos, wxDefaultSize, style | wxDIALOG_MODAL, wxDefaultValidator, wxT("filedialog") ))
+ {
+ wxFAIL_MSG( wxT("wxXX creation failed") );
+ return;
+ }
+
m_message = message;
- m_path = "";
+ m_path = wxT("");
m_fileName = defaultFileName;
m_dir = defaultDir;
m_wildCard = wildCard;
m_dialogStyle = style;
m_filterIndex = 1;
- m_widget = gtk_file_selection_new( m_message );
+ m_widget = gtk_file_selection_new( m_message.mbc_str() );
int x = (gdk_screen_width () - 400) / 2;
int y = (gdk_screen_height () - 400) / 2;
gtk_file_selection_hide_fileop_buttons( sel ); // they don't work anyway
m_path.Append(m_dir);
- if( ! m_path.IsEmpty() && m_path.Last()!='/' )
+ if( ! m_path.IsEmpty() && m_path.Last()!=wxT('/') )
m_path.Append('/');
m_path.Append(m_fileName);
- if(m_path.Length()>1) gtk_file_selection_set_filename(sel,m_path);
+ if(m_path.Length()>1) gtk_file_selection_set_filename(sel,m_path.mbc_str());
gtk_signal_connect( GTK_OBJECT(sel->ok_button), "clicked",
GTK_SIGNAL_FUNC(gtk_filedialog_ok_callback), (gpointer*)this );
// strange way to internationalize
- gtk_label_set( GTK_LABEL( GTK_BUTTON(sel->ok_button)->child ), _("OK") );
+ gtk_label_set( GTK_LABEL( GTK_BUTTON(sel->ok_button)->child ), wxConvCurrent->cWX2MB(_("OK")) );
gtk_signal_connect( GTK_OBJECT(sel->cancel_button), "clicked",
GTK_SIGNAL_FUNC(gtk_filedialog_cancel_callback), (gpointer*)this );
// strange way to internationalize
- gtk_label_set( GTK_LABEL( GTK_BUTTON(sel->cancel_button)->child ), _("Cancel") );
+ gtk_label_set( GTK_LABEL( GTK_BUTTON(sel->cancel_button)->child ), wxConvCurrent->cWX2MB(_("Cancel")) );
gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
GTK_SIGNAL_FUNC(gtk_filedialog_delete_callback), (gpointer)this );
{
wxString ext;
wxSplitPath(path, &m_dir, &m_fileName, &ext);
- m_fileName += ext;
+ if (!ext.IsEmpty())
+ {
+ m_fileName += wxT(".");
+ m_fileName += ext;
+ }
}
}
// global functions
// ----------------------------------------------------------------------------
-wxString wxFileSelector( const char *title,
- const char *defaultDir, const char *defaultFileName,
- const char *defaultExtension, const char *filter, int flags,
+wxString
+wxFileSelectorEx(const wxChar *message,
+ const wxChar *default_path,
+ const wxChar *default_filename,
+ int *indexDefaultExtension,
+ const wxChar *wildcard,
+ int flags,
+ wxWindow *parent,
+ int x, int y)
+{
+ // TODO: implement this somehow
+ return wxFileSelector(message, default_path, default_filename, wxT(""),
+ wildcard, flags, parent, x, y);
+}
+
+wxString wxFileSelector( const wxChar *title,
+ const wxChar *defaultDir, const wxChar *defaultFileName,
+ const wxChar *defaultExtension, const wxChar *filter, int flags,
wxWindow *parent, int x, int y )
{
wxString filter2;
if ( defaultExtension && !filter )
- filter2 = wxString("*.") + wxString(defaultExtension) ;
+ filter2 = wxString(wxT("*.")) + wxString(defaultExtension) ;
else if ( filter )
filter2 = filter;
}
}
-wxString wxLoadFileSelector( const char *what, const char *extension, const char *default_name, wxWindow *parent )
+wxString wxLoadFileSelector( const wxChar *what, const wxChar *extension, const wxChar *default_name, wxWindow *parent )
{
- char *ext = (char *)extension;
+ wxChar *ext = (wxChar *)extension;
- char prompt[50];
+ wxChar prompt[50];
wxString str = _("Load %s file");
- sprintf(prompt, str, what);
+ wxSprintf(prompt, str, what);
- if (*ext == '.') ext++;
- char wild[60];
- sprintf(wild, "*.%s", ext);
+ if (*ext == wxT('.')) ext++;
+ wxChar wild[60];
+ wxSprintf(wild, wxT("*.%s"), ext);
- return wxFileSelector (prompt, (const char *) NULL, default_name, ext, wild, 0, parent);
+ return wxFileSelector (prompt, (const wxChar *) NULL, default_name, ext, wild, 0, parent);
}
-wxString wxSaveFileSelector(const char *what, const char *extension, const char *default_name,
+wxString wxSaveFileSelector(const wxChar *what, const wxChar *extension, const wxChar *default_name,
wxWindow *parent )
{
- char *ext = (char *)extension;
+ wxChar *ext = (wxChar *)extension;
- char prompt[50];
+ wxChar prompt[50];
wxString str = _("Save %s file");
- sprintf(prompt, str, what);
+ wxSprintf(prompt, str, what);
- if (*ext == '.') ext++;
- char wild[60];
- sprintf(wild, "*.%s", ext);
+ if (*ext == wxT('.')) ext++;
+ wxChar wild[60];
+ wxSprintf(wild, wxT("*.%s"), ext);
- return wxFileSelector (prompt, (const char *) NULL, default_name, ext, wild, 0, parent);
+ return wxFileSelector (prompt, (const wxChar *) NULL, default_name, ext, wild, 0, parent);
}
projects / wxWidgets.git / blobdiff