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

Implemented run-time checks for the GTK version

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2004-12-05 23:03:09 +00:00
parent d7b995a497
commit 77f706726c
8 changed files with 420 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gtk/artgtk.cpp
View File

@@ -202,7 +202,7 @@ static GdkPixbuf *CreateStockIcon(const char *stockid, GtkIconSize size)
GTK_STATE_NORMAL, size, NULL, NULL); GTK_STATE_NORMAL, size, NULL, NULL);
} }
#if GTK_CHECK_VERSION(2,4,0) #ifdef __WXGTK24__
static GdkPixbuf *CreateThemeIcon(const char *iconname, static GdkPixbuf *CreateThemeIcon(const char *iconname,
GtkIconSize iconsize, const wxSize& sz) GtkIconSize iconsize, const wxSize& sz)
{ {
@@ -218,7 +218,7 @@ static GdkPixbuf *CreateThemeIcon(const char *iconname,
size.x, size.x,
(GtkIconLookupFlags)0, NULL); (GtkIconLookupFlags)0, NULL);
} }
#endif // GTK+ >= 2.4.0 #endif
wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id, wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
const wxArtClient& client, const wxArtClient& client,
@@ -235,9 +235,12 @@ wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
GdkPixbuf *pixbuf = CreateStockIcon(stockid, stocksize); GdkPixbuf *pixbuf = CreateStockIcon(stockid, stocksize);
#if GTK_CHECK_VERSION(2,4,0) #ifdef __WXGTK24__
if (!pixbuf) if (!gtk_check_version(2,4,0))
pixbuf = CreateThemeIcon(stockid, stocksize, size); {
if (!pixbuf)
pixbuf = CreateThemeIcon(stockid, stocksize, size);
}
#endif #endif
if (pixbuf && size != wxDefaultSize && if (pixbuf && size != wxDefaultSize &&

17
src/gtk/button.cpp
View File

@@ -127,13 +127,18 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label,
else if (HasFlag(wxBU_BOTTOM)) else if (HasFlag(wxBU_BOTTOM))
y_alignment = 1.0; y_alignment = 1.0;
#if GTK_CHECK_VERSION(2,4,0) #if __WXGTK24__
gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment); if (!gtk_check_version(2,4,0))
#else {
if (GTK_IS_MISC(BUTTON_CHILD(m_widget))) gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment);
gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)), }
x_alignment, y_alignment); else
#endif #endif
{
if (GTK_IS_MISC(BUTTON_CHILD(m_widget)))
gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)),
x_alignment, y_alignment);
}
SetLabel(label); SetLabel(label);

330
src/gtk/filedlg.cpp
View File

@@ -141,35 +141,37 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
wildCard, style, pos, true ) wildCard, style, pos, true )
{ {
#ifdef __WXGTK24__ #ifdef __WXGTK24__
m_needParent = FALSE; if (!gtk_check_version(2,4,0))
m_destroyed_by_delete = FALSE; {
m_needParent = FALSE;
m_destroyed_by_delete = FALSE;
if (!PreCreation(parent, pos, wxDefaultSize) || if (!PreCreation(parent, pos, wxDefaultSize) ||
!CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style, !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style,
wxDefaultValidator, wxT("filedialog"))) wxDefaultValidator, wxT("filedialog")))
{ {
wxFAIL_MSG( wxT("wxFileDialog creation failed") ); wxFAIL_MSG( wxT("wxFileDialog creation failed") );
return; return;
} }
bool multiple = (style & wxMULTIPLE) == wxMULTIPLE; bool multiple = (style & wxMULTIPLE) == wxMULTIPLE;
GtkFileChooserAction gtk_action; GtkFileChooserAction gtk_action;
GtkWindow* gtk_parent = NULL; GtkWindow* gtk_parent = NULL;
if (parent) if (parent)
gtk_parent = GTK_WINDOW(parent->m_widget); gtk_parent = GTK_WINDOW(parent->m_widget);
gchar* ok_btn_stock; gchar* ok_btn_stock;
if ((style & wxSAVE) == wxSAVE) if ((style & wxSAVE) == wxSAVE)
{ {
gtk_action = GTK_FILE_CHOOSER_ACTION_SAVE; gtk_action = GTK_FILE_CHOOSER_ACTION_SAVE;
ok_btn_stock = GTK_STOCK_SAVE; ok_btn_stock = GTK_STOCK_SAVE;
} }
else else
{ {
gtk_action = GTK_FILE_CHOOSER_ACTION_OPEN; gtk_action = GTK_FILE_CHOOSER_ACTION_OPEN;
ok_btn_stock = GTK_STOCK_OPEN; ok_btn_stock = GTK_STOCK_OPEN;
} }
m_widget = gtk_file_chooser_dialog_new( m_widget = gtk_file_chooser_dialog_new(
wxGTK_CONV(m_message), wxGTK_CONV(m_message),
gtk_parent, gtk_parent,
gtk_action, gtk_action,
@@ -177,232 +179,262 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
ok_btn_stock, GTK_RESPONSE_ACCEPT, ok_btn_stock, GTK_RESPONSE_ACCEPT,
NULL); NULL);
gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(m_widget), multiple); gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(m_widget), multiple);
gtk_signal_connect(GTK_OBJECT(m_widget), gtk_signal_connect(GTK_OBJECT(m_widget),
"response", "response",
GTK_SIGNAL_FUNC(gtk_filedialog_response_callback), GTK_SIGNAL_FUNC(gtk_filedialog_response_callback),
(gpointer*)this); (gpointer*)this);
m_path = m_dir; m_path = m_dir;
if (!m_path.empty() && m_path.Last() != wxT('/')) if (!m_path.empty() && m_path.Last() != wxT('/'))
m_path += wxT('/'); m_path += wxT('/');
m_path += m_fileName; m_path += m_fileName;
SetPath(m_path); SetPath(m_path);
SetWildcard(wildCard); SetWildcard(wildCard);
SetFilterIndex(0); SetFilterIndex(0);
#else }
wxGenericFileDialog::Create( parent, message, defaultDir, defaultFileName, wildCard, style, pos ); else
#endif #endif
wxGenericFileDialog::Create( parent, message, defaultDir, defaultFileName, wildCard, style, pos );
} }
wxFileDialog::~wxFileDialog() wxFileDialog::~wxFileDialog()
{ {
#ifdef __WXGTK24__ #ifdef __WXGTK24__
if (m_destroyed_by_delete) if (!gtk_check_version(2,4,0))
m_widget = NULL; {
if (m_destroyed_by_delete)
m_widget = NULL;
}
#endif #endif
} }
void wxFileDialog::OnFakeOk( wxCommandEvent &event ) void wxFileDialog::OnFakeOk( wxCommandEvent &event )
{ {
#ifdef __WXGTK24__ #ifdef __WXGTK24__
wxDialog::OnOK( event ); if (!gtk_check_version(2,4,0))
#else wxDialog::OnOK( event );
wxGenericFileDialog::OnListOk( event ); else
#endif #endif
wxGenericFileDialog::OnListOk( event );
} }
int wxFileDialog::ShowModal() int wxFileDialog::ShowModal()
{ {
#ifdef __WXGTK24__ #ifdef __WXGTK24__
return wxDialog::ShowModal(); if (!gtk_check_version(2,4,0))
#else return wxDialog::ShowModal();
return wxGenericFileDialog::ShowModal(); else
#endif #endif
return wxGenericFileDialog::ShowModal();
} }
bool wxFileDialog::Show( bool show ) bool wxFileDialog::Show( bool show )
{ {
#ifdef __WXGTK24__ #ifdef __WXGTK24__
return wxDialog::Show( show ); if (!gtk_check_version(2,4,0))
#else return wxDialog::Show( show );
return wxGenericFileDialog::Show( show ); else
#endif #endif
return wxGenericFileDialog::Show( show );
} }
void wxFileDialog::GetFilenames(wxArrayString& files) const void wxFileDialog::GetFilenames(wxArrayString& files) const
{ {
#ifdef __WXGTK24__ #ifdef __WXGTK24__
GetPaths(files); if (!gtk_check_version(2,4,0))
for (size_t n = 0; n < files.GetCount(); n++ )
{ {
wxString name,ext; GetPaths(files);
wxSplitPath(files[n], NULL, &name, &ext); for (size_t n = 0; n < files.GetCount(); n++ )
if (!ext.IsEmpty())
{ {
name += wxT("."); wxString name,ext;
name += ext; wxSplitPath(files[n], NULL, &name, &ext);
if (!ext.IsEmpty())
{
name += wxT(".");
name += ext;
}
files[n] = name;
} }
files[n] = name;
} }
#else else
wxGenericFileDialog::GetFilenames( files );
#endif #endif
wxGenericFileDialog::GetFilenames( files );
} }
void wxFileDialog::GetPaths(wxArrayString& paths) const void wxFileDialog::GetPaths(wxArrayString& paths) const
{ {
#ifdef __WXGTK24__ #ifdef __WXGTK24__
paths.Empty(); if (!gtk_check_version(2,4,0))
if (GetWindowStyle() & wxMULTIPLE)
{ {
GSList *gpathsi = paths.Empty();
gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(m_widget)); if (GetWindowStyle() & wxMULTIPLE)
GSList *gpaths = gpathsi;
while (gpathsi)
{ {
wxString file = wxGTK_CONV_BACK((gchar*) gpathsi->data); GSList *gpathsi =
paths.Add(file); gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(m_widget));
g_free(gpathsi->data); GSList *gpaths = gpathsi;
gpathsi = gpathsi->next; while (gpathsi)
{
wxString file = wxGTK_CONV_BACK((gchar*) gpathsi->data);
paths.Add(file);
g_free(gpathsi->data);
gpathsi = gpathsi->next;
}
if (gpaths)
g_slist_free(gpaths);
}
else
{
paths.Add(m_fileName);
} }
if (gpaths)
g_slist_free(gpaths);
} }
else else
{
paths.Add(m_fileName);
}
#else
wxGenericFileDialog::GetPaths( paths );
#endif #endif
wxGenericFileDialog::GetPaths( paths );
} }
void wxFileDialog::SetMessage(const wxString& message) void wxFileDialog::SetMessage(const wxString& message)
{ {
#ifdef __WXGTK24__ #ifdef __WXGTK24__
m_message = message; if (!gtk_check_version(2,4,0))
SetTitle(message); {
#else m_message = message;
wxGenericFileDialog::SetMessage( message ); SetTitle(message);
}
else
#endif #endif
wxGenericFileDialog::SetMessage( message );
} }
void wxFileDialog::SetPath(const wxString& path) void wxFileDialog::SetPath(const wxString& path)
{ {
#ifdef __WXGTK24__ #ifdef __WXGTK24__
if (path.empty()) return; if (!gtk_check_version(2,4,0))
{
if (path.empty()) return;
wxFileName fn(path); wxFileName fn(path);
m_path = fn.GetFullPath(); m_path = fn.GetFullPath();
m_dir = fn.GetPath(); m_dir = fn.GetPath();
m_fileName = fn.GetFullName(); m_fileName = fn.GetFullName();
UpdateDialog(); UpdateDialog();
#else }
wxGenericFileDialog::SetPath( path ); else
#endif #endif
wxGenericFileDialog::SetPath( path );
} }
void wxFileDialog::SetDirectory(const wxString& dir) void wxFileDialog::SetDirectory(const wxString& dir)
{ {
#ifdef __WXGTK24__ #ifdef __WXGTK24__
if (wxDirExists(dir)) if (!gtk_check_version(2,4,0))
{ {
m_dir = dir; if (wxDirExists(dir))
m_path = wxFileName(m_dir, m_fileName).GetFullPath(); {
UpdateDialog(); m_dir = dir;
m_path = wxFileName(m_dir, m_fileName).GetFullPath();
UpdateDialog();
}
} }
#else else
wxGenericFileDialog::SetDirectory( dir );
#endif #endif
wxGenericFileDialog::SetDirectory( dir );
} }
void wxFileDialog::SetFilename(const wxString& name) void wxFileDialog::SetFilename(const wxString& name)
{ {
#ifdef __WXGTK24__ #ifdef __WXGTK24__
m_fileName = name; if (!gtk_check_version(2,4,0))
m_path = wxFileName(m_dir, m_fileName).GetFullPath(); {
UpdateDialog(); m_fileName = name;
#else m_path = wxFileName(m_dir, m_fileName).GetFullPath();
wxGenericFileDialog::SetFilename( name ); UpdateDialog();
}
else
#endif #endif
wxGenericFileDialog::SetFilename( name );
} }
void wxFileDialog::SetWildcard(const wxString& wildCard) void wxFileDialog::SetWildcard(const wxString& wildCard)
{ {
#ifdef __WXGTK24__ #ifdef __WXGTK24__
m_wildCard = wildCard; if (!gtk_check_version(2,4,0))
GtkFileChooser* chooser = GTK_FILE_CHOOSER(m_widget);
// empty current filter list:
GSList* ifilters = gtk_file_chooser_list_filters(chooser);
GSList* filters = ifilters;
while (ifilters)
{ {
gtk_file_chooser_remove_filter(chooser,GTK_FILE_FILTER(ifilters->data)); m_wildCard = wildCard;
ifilters = ifilters->next; GtkFileChooser* chooser = GTK_FILE_CHOOSER(m_widget);
}
g_slist_free(filters);
// parse filters // empty current filter list:
wxArrayString wildDescriptions, wildFilters; GSList* ifilters = gtk_file_chooser_list_filters(chooser);
if (!wxParseCommonDialogsFilter(m_wildCard, wildDescriptions, wildFilters)) GSList* filters = ifilters;
{ while (ifilters)
wxFAIL_MSG( wxT("Wrong file type description") );
}
else
{
// add parsed to GtkChooser
for (size_t n = 0; n < wildFilters.GetCount(); n++)
{ {
GtkFileFilter* filter = gtk_file_filter_new(); gtk_file_chooser_remove_filter(chooser,GTK_FILE_FILTER(ifilters->data));
gtk_file_filter_set_name(filter,wxGTK_CONV(wildDescriptions[n])); ifilters = ifilters->next;
wxString after = wildFilters[n]; }
do g_slist_free(filters);
// parse filters
wxArrayString wildDescriptions, wildFilters;
if (!wxParseCommonDialogsFilter(m_wildCard, wildDescriptions, wildFilters))
{
wxFAIL_MSG( wxT("Wrong file type description") );
}
else
{
// add parsed to GtkChooser
for (size_t n = 0; n < wildFilters.GetCount(); n++)
{ {
wxString ext = after.BeforeFirst(wxT(';')); GtkFileFilter* filter = gtk_file_filter_new();
gtk_file_filter_add_pattern(filter,wxGTK_CONV(ext)); gtk_file_filter_set_name(filter,wxGTK_CONV(wildDescriptions[n]));
if (after.Find(wxT(';')) == wxNOT_FOUND) wxString after = wildFilters[n];
break; do
after = after.AfterLast(wxT(';')); {
} wxString ext = after.BeforeFirst(wxT(';'));
while (!after.empty()); gtk_file_filter_add_pattern(filter,wxGTK_CONV(ext));
if (after.Find(wxT(';')) == wxNOT_FOUND)
break;
after = after.AfterLast(wxT(';'));
}
while (!after.empty());
gtk_file_chooser_add_filter(chooser, filter); gtk_file_chooser_add_filter(chooser, filter);
}
} }
} }
#else else
wxGenericFileDialog::SetWildcard( wildCard );
#endif #endif
wxGenericFileDialog::SetWildcard( wildCard );
} }
void wxFileDialog::SetFilterIndex(int filterIndex) void wxFileDialog::SetFilterIndex(int filterIndex)
{ {
#ifdef __WXGTK24__ #ifdef __WXGTK24__
m_filterIndex = filterIndex; if (!gtk_check_version(2,4,0))
GtkFileChooser *chooser = GTK_FILE_CHOOSER(m_widget);
GSList *fnode = gtk_file_chooser_list_filters(chooser);
GSList *filters = fnode;
int i = 0;
while (fnode)
{ {
if (i == filterIndex) m_filterIndex = filterIndex;
GtkFileChooser *chooser = GTK_FILE_CHOOSER(m_widget);
GSList *fnode = gtk_file_chooser_list_filters(chooser);
GSList *filters = fnode;
int i = 0;
while (fnode)
{ {
gtk_file_chooser_set_filter(chooser, GTK_FILE_FILTER(fnode->data)); if (i == filterIndex)
m_filterIndex = i; {
break; gtk_file_chooser_set_filter(chooser, GTK_FILE_FILTER(fnode->data));
m_filterIndex = i;
break;
}
i++;
fnode = fnode->next;
} }
i++; g_slist_free(filters);
fnode = fnode->next;
} }
g_slist_free(filters); else
#else
wxGenericFileDialog::SetFilterIndex( filterIndex );
#endif #endif
wxGenericFileDialog::SetFilterIndex( filterIndex );
} }
void wxFileDialog::UpdateDialog() void wxFileDialog::UpdateDialog()

17
src/gtk/textctrl.cpp
View File

@@ -487,16 +487,19 @@ bool wxTextCtrl::Create( wxWindow *parent,
gtk_text_view_set_justification( GTK_TEXT_VIEW(m_text), GTK_JUSTIFY_CENTER ); gtk_text_view_set_justification( GTK_TEXT_VIEW(m_text), GTK_JUSTIFY_CENTER );
// Left justify (alignment) is the default and we don't need to apply GTK_JUSTIFY_LEFT // Left justify (alignment) is the default and we don't need to apply GTK_JUSTIFY_LEFT
} }
// gtk_entry_set_alignment was introduced in gtk+-2.3.5
#if GTK_CHECK_VERSION(2, 3, 5)
else else
{ {
if (style & wxTE_RIGHT) #ifdef __WXGTK24__
gtk_entry_set_alignment( GTK_ENTRY(m_text), 1.0 ); // gtk_entry_set_alignment was introduced in gtk+-2.3.5
else if (style & wxTE_CENTRE) if (!gtk_check_version(2,4,0))
gtk_entry_set_alignment( GTK_ENTRY(m_text), 0.5 ); {
if (style & wxTE_RIGHT)
gtk_entry_set_alignment( GTK_ENTRY(m_text), 1.0 );
else if (style & wxTE_CENTRE)
gtk_entry_set_alignment( GTK_ENTRY(m_text), 0.5 );
}
#endif
} }
#endif // gtk+-2.3.5
#endif // __WXGTK20__ #endif // __WXGTK20__
// We want to be notified about text changes. // We want to be notified about text changes.

13
src/gtk1/artgtk.cpp
View File

@@ -202,7 +202,7 @@ static GdkPixbuf *CreateStockIcon(const char *stockid, GtkIconSize size)
GTK_STATE_NORMAL, size, NULL, NULL); GTK_STATE_NORMAL, size, NULL, NULL);
} }
#if GTK_CHECK_VERSION(2,4,0) #ifdef __WXGTK24__
static GdkPixbuf *CreateThemeIcon(const char *iconname, static GdkPixbuf *CreateThemeIcon(const char *iconname,
GtkIconSize iconsize, const wxSize& sz) GtkIconSize iconsize, const wxSize& sz)
{ {
@@ -218,7 +218,7 @@ static GdkPixbuf *CreateThemeIcon(const char *iconname,
size.x, size.x,
(GtkIconLookupFlags)0, NULL); (GtkIconLookupFlags)0, NULL);
} }
#endif // GTK+ >= 2.4.0 #endif
wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id, wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
const wxArtClient& client, const wxArtClient& client,
@@ -235,9 +235,12 @@ wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
GdkPixbuf *pixbuf = CreateStockIcon(stockid, stocksize); GdkPixbuf *pixbuf = CreateStockIcon(stockid, stocksize);
#if GTK_CHECK_VERSION(2,4,0) #ifdef __WXGTK24__
if (!pixbuf) if (!gtk_check_version(2,4,0))
pixbuf = CreateThemeIcon(stockid, stocksize, size); {
if (!pixbuf)
pixbuf = CreateThemeIcon(stockid, stocksize, size);
}
#endif #endif
if (pixbuf && size != wxDefaultSize && if (pixbuf && size != wxDefaultSize &&

17
src/gtk1/button.cpp
View File

@@ -127,13 +127,18 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label,
else if (HasFlag(wxBU_BOTTOM)) else if (HasFlag(wxBU_BOTTOM))
y_alignment = 1.0; y_alignment = 1.0;
#if GTK_CHECK_VERSION(2,4,0) #if __WXGTK24__
gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment); if (!gtk_check_version(2,4,0))
#else {
if (GTK_IS_MISC(BUTTON_CHILD(m_widget))) gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment);
gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)), }
x_alignment, y_alignment); else
#endif #endif
{
if (GTK_IS_MISC(BUTTON_CHILD(m_widget)))
gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)),
x_alignment, y_alignment);
}
SetLabel(label); SetLabel(label);

330
src/gtk1/filedlg.cpp
View File

@@ -141,35 +141,37 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
wildCard, style, pos, true ) wildCard, style, pos, true )
{ {
#ifdef __WXGTK24__ #ifdef __WXGTK24__
m_needParent = FALSE; if (!gtk_check_version(2,4,0))
m_destroyed_by_delete = FALSE; {
m_needParent = FALSE;
m_destroyed_by_delete = FALSE;
if (!PreCreation(parent, pos, wxDefaultSize) || if (!PreCreation(parent, pos, wxDefaultSize) ||
!CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style, !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style,
wxDefaultValidator, wxT("filedialog"))) wxDefaultValidator, wxT("filedialog")))
{ {
wxFAIL_MSG( wxT("wxFileDialog creation failed") ); wxFAIL_MSG( wxT("wxFileDialog creation failed") );
return; return;
} }
bool multiple = (style & wxMULTIPLE) == wxMULTIPLE; bool multiple = (style & wxMULTIPLE) == wxMULTIPLE;
GtkFileChooserAction gtk_action; GtkFileChooserAction gtk_action;
GtkWindow* gtk_parent = NULL; GtkWindow* gtk_parent = NULL;
if (parent) if (parent)
gtk_parent = GTK_WINDOW(parent->m_widget); gtk_parent = GTK_WINDOW(parent->m_widget);
gchar* ok_btn_stock; gchar* ok_btn_stock;
if ((style & wxSAVE) == wxSAVE) if ((style & wxSAVE) == wxSAVE)
{ {
gtk_action = GTK_FILE_CHOOSER_ACTION_SAVE; gtk_action = GTK_FILE_CHOOSER_ACTION_SAVE;
ok_btn_stock = GTK_STOCK_SAVE; ok_btn_stock = GTK_STOCK_SAVE;
} }
else else
{ {
gtk_action = GTK_FILE_CHOOSER_ACTION_OPEN; gtk_action = GTK_FILE_CHOOSER_ACTION_OPEN;
ok_btn_stock = GTK_STOCK_OPEN; ok_btn_stock = GTK_STOCK_OPEN;
} }
m_widget = gtk_file_chooser_dialog_new( m_widget = gtk_file_chooser_dialog_new(
wxGTK_CONV(m_message), wxGTK_CONV(m_message),
gtk_parent, gtk_parent,
gtk_action, gtk_action,
@@ -177,232 +179,262 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
ok_btn_stock, GTK_RESPONSE_ACCEPT, ok_btn_stock, GTK_RESPONSE_ACCEPT,
NULL); NULL);
gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(m_widget), multiple); gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(m_widget), multiple);
gtk_signal_connect(GTK_OBJECT(m_widget), gtk_signal_connect(GTK_OBJECT(m_widget),
"response", "response",
GTK_SIGNAL_FUNC(gtk_filedialog_response_callback), GTK_SIGNAL_FUNC(gtk_filedialog_response_callback),
(gpointer*)this); (gpointer*)this);
m_path = m_dir; m_path = m_dir;
if (!m_path.empty() && m_path.Last() != wxT('/')) if (!m_path.empty() && m_path.Last() != wxT('/'))
m_path += wxT('/'); m_path += wxT('/');
m_path += m_fileName; m_path += m_fileName;
SetPath(m_path); SetPath(m_path);
SetWildcard(wildCard); SetWildcard(wildCard);
SetFilterIndex(0); SetFilterIndex(0);
#else }
wxGenericFileDialog::Create( parent, message, defaultDir, defaultFileName, wildCard, style, pos ); else
#endif #endif
wxGenericFileDialog::Create( parent, message, defaultDir, defaultFileName, wildCard, style, pos );
} }
wxFileDialog::~wxFileDialog() wxFileDialog::~wxFileDialog()
{ {
#ifdef __WXGTK24__ #ifdef __WXGTK24__
if (m_destroyed_by_delete) if (!gtk_check_version(2,4,0))
m_widget = NULL; {
if (m_destroyed_by_delete)
m_widget = NULL;
}
#endif #endif
} }
void wxFileDialog::OnFakeOk( wxCommandEvent &event ) void wxFileDialog::OnFakeOk( wxCommandEvent &event )
{ {
#ifdef __WXGTK24__ #ifdef __WXGTK24__
wxDialog::OnOK( event ); if (!gtk_check_version(2,4,0))
#else wxDialog::OnOK( event );
wxGenericFileDialog::OnListOk( event ); else
#endif #endif
wxGenericFileDialog::OnListOk( event );
} }
int wxFileDialog::ShowModal() int wxFileDialog::ShowModal()
{ {
#ifdef __WXGTK24__ #ifdef __WXGTK24__
return wxDialog::ShowModal(); if (!gtk_check_version(2,4,0))
#else return wxDialog::ShowModal();
return wxGenericFileDialog::ShowModal(); else
#endif #endif
return wxGenericFileDialog::ShowModal();
} }
bool wxFileDialog::Show( bool show ) bool wxFileDialog::Show( bool show )
{ {
#ifdef __WXGTK24__ #ifdef __WXGTK24__
return wxDialog::Show( show ); if (!gtk_check_version(2,4,0))
#else return wxDialog::Show( show );
return wxGenericFileDialog::Show( show ); else
#endif #endif
return wxGenericFileDialog::Show( show );
} }
void wxFileDialog::GetFilenames(wxArrayString& files) const void wxFileDialog::GetFilenames(wxArrayString& files) const
{ {
#ifdef __WXGTK24__ #ifdef __WXGTK24__
GetPaths(files); if (!gtk_check_version(2,4,0))
for (size_t n = 0; n < files.GetCount(); n++ )
{ {
wxString name,ext; GetPaths(files);
wxSplitPath(files[n], NULL, &name, &ext); for (size_t n = 0; n < files.GetCount(); n++ )
if (!ext.IsEmpty())
{ {
name += wxT("."); wxString name,ext;
name += ext; wxSplitPath(files[n], NULL, &name, &ext);
if (!ext.IsEmpty())
{
name += wxT(".");
name += ext;
}
files[n] = name;
} }
files[n] = name;
} }
#else else
wxGenericFileDialog::GetFilenames( files );
#endif #endif
wxGenericFileDialog::GetFilenames( files );
} }
void wxFileDialog::GetPaths(wxArrayString& paths) const void wxFileDialog::GetPaths(wxArrayString& paths) const
{ {
#ifdef __WXGTK24__ #ifdef __WXGTK24__
paths.Empty(); if (!gtk_check_version(2,4,0))
if (GetWindowStyle() & wxMULTIPLE)
{ {
GSList *gpathsi = paths.Empty();
gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(m_widget)); if (GetWindowStyle() & wxMULTIPLE)
GSList *gpaths = gpathsi;
while (gpathsi)
{ {
wxString file = wxGTK_CONV_BACK((gchar*) gpathsi->data); GSList *gpathsi =
paths.Add(file); gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(m_widget));
g_free(gpathsi->data); GSList *gpaths = gpathsi;
gpathsi = gpathsi->next; while (gpathsi)
{
wxString file = wxGTK_CONV_BACK((gchar*) gpathsi->data);
paths.Add(file);
g_free(gpathsi->data);
gpathsi = gpathsi->next;
}
if (gpaths)
g_slist_free(gpaths);
}
else
{
paths.Add(m_fileName);
} }
if (gpaths)
g_slist_free(gpaths);
} }
else else
{
paths.Add(m_fileName);
}
#else
wxGenericFileDialog::GetPaths( paths );
#endif #endif
wxGenericFileDialog::GetPaths( paths );
} }
void wxFileDialog::SetMessage(const wxString& message) void wxFileDialog::SetMessage(const wxString& message)
{ {
#ifdef __WXGTK24__ #ifdef __WXGTK24__
m_message = message; if (!gtk_check_version(2,4,0))
SetTitle(message); {
#else m_message = message;
wxGenericFileDialog::SetMessage( message ); SetTitle(message);
}
else
#endif #endif
wxGenericFileDialog::SetMessage( message );
} }
void wxFileDialog::SetPath(const wxString& path) void wxFileDialog::SetPath(const wxString& path)
{ {
#ifdef __WXGTK24__ #ifdef __WXGTK24__
if (path.empty()) return; if (!gtk_check_version(2,4,0))
{
if (path.empty()) return;
wxFileName fn(path); wxFileName fn(path);
m_path = fn.GetFullPath(); m_path = fn.GetFullPath();
m_dir = fn.GetPath(); m_dir = fn.GetPath();
m_fileName = fn.GetFullName(); m_fileName = fn.GetFullName();
UpdateDialog(); UpdateDialog();
#else }
wxGenericFileDialog::SetPath( path ); else
#endif #endif
wxGenericFileDialog::SetPath( path );
} }
void wxFileDialog::SetDirectory(const wxString& dir) void wxFileDialog::SetDirectory(const wxString& dir)
{ {
#ifdef __WXGTK24__ #ifdef __WXGTK24__
if (wxDirExists(dir)) if (!gtk_check_version(2,4,0))
{ {
m_dir = dir; if (wxDirExists(dir))
m_path = wxFileName(m_dir, m_fileName).GetFullPath(); {
UpdateDialog(); m_dir = dir;
m_path = wxFileName(m_dir, m_fileName).GetFullPath();
UpdateDialog();
}
} }
#else else
wxGenericFileDialog::SetDirectory( dir );
#endif #endif
wxGenericFileDialog::SetDirectory( dir );
} }
void wxFileDialog::SetFilename(const wxString& name) void wxFileDialog::SetFilename(const wxString& name)
{ {
#ifdef __WXGTK24__ #ifdef __WXGTK24__
m_fileName = name; if (!gtk_check_version(2,4,0))
m_path = wxFileName(m_dir, m_fileName).GetFullPath(); {
UpdateDialog(); m_fileName = name;
#else m_path = wxFileName(m_dir, m_fileName).GetFullPath();
wxGenericFileDialog::SetFilename( name ); UpdateDialog();
}
else
#endif #endif
wxGenericFileDialog::SetFilename( name );
} }
void wxFileDialog::SetWildcard(const wxString& wildCard) void wxFileDialog::SetWildcard(const wxString& wildCard)
{ {
#ifdef __WXGTK24__ #ifdef __WXGTK24__
m_wildCard = wildCard; if (!gtk_check_version(2,4,0))
GtkFileChooser* chooser = GTK_FILE_CHOOSER(m_widget);
// empty current filter list:
GSList* ifilters = gtk_file_chooser_list_filters(chooser);
GSList* filters = ifilters;
while (ifilters)
{ {
gtk_file_chooser_remove_filter(chooser,GTK_FILE_FILTER(ifilters->data)); m_wildCard = wildCard;
ifilters = ifilters->next; GtkFileChooser* chooser = GTK_FILE_CHOOSER(m_widget);
}
g_slist_free(filters);
// parse filters // empty current filter list:
wxArrayString wildDescriptions, wildFilters; GSList* ifilters = gtk_file_chooser_list_filters(chooser);
if (!wxParseCommonDialogsFilter(m_wildCard, wildDescriptions, wildFilters)) GSList* filters = ifilters;
{ while (ifilters)
wxFAIL_MSG( wxT("Wrong file type description") );
}
else
{
// add parsed to GtkChooser
for (size_t n = 0; n < wildFilters.GetCount(); n++)
{ {
GtkFileFilter* filter = gtk_file_filter_new(); gtk_file_chooser_remove_filter(chooser,GTK_FILE_FILTER(ifilters->data));
gtk_file_filter_set_name(filter,wxGTK_CONV(wildDescriptions[n])); ifilters = ifilters->next;
wxString after = wildFilters[n]; }
do g_slist_free(filters);
// parse filters
wxArrayString wildDescriptions, wildFilters;
if (!wxParseCommonDialogsFilter(m_wildCard, wildDescriptions, wildFilters))
{
wxFAIL_MSG( wxT("Wrong file type description") );
}
else
{
// add parsed to GtkChooser
for (size_t n = 0; n < wildFilters.GetCount(); n++)
{ {
wxString ext = after.BeforeFirst(wxT(';')); GtkFileFilter* filter = gtk_file_filter_new();
gtk_file_filter_add_pattern(filter,wxGTK_CONV(ext)); gtk_file_filter_set_name(filter,wxGTK_CONV(wildDescriptions[n]));
if (after.Find(wxT(';')) == wxNOT_FOUND) wxString after = wildFilters[n];
break; do
after = after.AfterLast(wxT(';')); {
} wxString ext = after.BeforeFirst(wxT(';'));
while (!after.empty()); gtk_file_filter_add_pattern(filter,wxGTK_CONV(ext));
if (after.Find(wxT(';')) == wxNOT_FOUND)
break;
after = after.AfterLast(wxT(';'));
}
while (!after.empty());
gtk_file_chooser_add_filter(chooser, filter); gtk_file_chooser_add_filter(chooser, filter);
}
} }
} }
#else else
wxGenericFileDialog::SetWildcard( wildCard );
#endif #endif
wxGenericFileDialog::SetWildcard( wildCard );
} }
void wxFileDialog::SetFilterIndex(int filterIndex) void wxFileDialog::SetFilterIndex(int filterIndex)
{ {
#ifdef __WXGTK24__ #ifdef __WXGTK24__
m_filterIndex = filterIndex; if (!gtk_check_version(2,4,0))
GtkFileChooser *chooser = GTK_FILE_CHOOSER(m_widget);
GSList *fnode = gtk_file_chooser_list_filters(chooser);
GSList *filters = fnode;
int i = 0;
while (fnode)
{ {
if (i == filterIndex) m_filterIndex = filterIndex;
GtkFileChooser *chooser = GTK_FILE_CHOOSER(m_widget);
GSList *fnode = gtk_file_chooser_list_filters(chooser);
GSList *filters = fnode;
int i = 0;
while (fnode)
{ {
gtk_file_chooser_set_filter(chooser, GTK_FILE_FILTER(fnode->data)); if (i == filterIndex)
m_filterIndex = i; {
break; gtk_file_chooser_set_filter(chooser, GTK_FILE_FILTER(fnode->data));
m_filterIndex = i;
break;
}
i++;
fnode = fnode->next;
} }
i++; g_slist_free(filters);
fnode = fnode->next;
} }
g_slist_free(filters); else
#else
wxGenericFileDialog::SetFilterIndex( filterIndex );
#endif #endif
wxGenericFileDialog::SetFilterIndex( filterIndex );
} }
void wxFileDialog::UpdateDialog() void wxFileDialog::UpdateDialog()

17
src/gtk1/textctrl.cpp
View File

@@ -487,16 +487,19 @@ bool wxTextCtrl::Create( wxWindow *parent,
gtk_text_view_set_justification( GTK_TEXT_VIEW(m_text), GTK_JUSTIFY_CENTER ); gtk_text_view_set_justification( GTK_TEXT_VIEW(m_text), GTK_JUSTIFY_CENTER );
// Left justify (alignment) is the default and we don't need to apply GTK_JUSTIFY_LEFT // Left justify (alignment) is the default and we don't need to apply GTK_JUSTIFY_LEFT
} }
// gtk_entry_set_alignment was introduced in gtk+-2.3.5
#if GTK_CHECK_VERSION(2, 3, 5)
else else
{ {
if (style & wxTE_RIGHT) #ifdef __WXGTK24__
gtk_entry_set_alignment( GTK_ENTRY(m_text), 1.0 ); // gtk_entry_set_alignment was introduced in gtk+-2.3.5
else if (style & wxTE_CENTRE) if (!gtk_check_version(2,4,0))
gtk_entry_set_alignment( GTK_ENTRY(m_text), 0.5 ); {
if (style & wxTE_RIGHT)
gtk_entry_set_alignment( GTK_ENTRY(m_text), 1.0 );
else if (style & wxTE_CENTRE)
gtk_entry_set_alignment( GTK_ENTRY(m_text), 0.5 );
}
#endif
} }
#endif // gtk+-2.3.5
#endif // __WXGTK20__ #endif // __WXGTK20__
// We want to be notified about text changes. // We want to be notified about text changes.