Implemented run-time checks for the GTK version

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/artgtk.cpp b/src/gtk/artgtk.cpp
index dafc3dc2c90788a9fa0b5bd8b44c7bd6e1557000..a33fd455adcf12f66ff4dda5d81ffc556282fe64 100644 (file)
--- a/src/gtk/artgtk.cpp
+++ b/src/gtk/artgtk.cpp
@@ -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,
                                   GtkIconSize iconsize, const wxSize& sz)
 {
 static GdkPixbuf *CreateThemeIcon(const char *iconname,
                                   GtkIconSize iconsize, const wxSize& sz)
 {


@@ -218,7 +218,7 @@ static GdkPixbuf *CreateThemeIcon(const char *iconname,
                     size.x,
                     (GtkIconLookupFlags)0, NULL);
 }
                     size.x,
                     (GtkIconLookupFlags)0, NULL);
 }

-#endif // GTK+ >= 2.4.0
+#endif

 
 wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
                                          const wxArtClient& client,
 
 wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
                                          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)
-    if (!pixbuf)
-        pixbuf = CreateThemeIcon(stockid, stocksize, size);
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+    {
+        if (!pixbuf)
+            pixbuf = CreateThemeIcon(stockid, stocksize, size);
+    }

 #endif
 
     if (pixbuf && size != wxDefaultSize &&
 #endif
 
     if (pixbuf && size != wxDefaultSize &&

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index 435358d25ffb4da2b54cc1402e327246d47c3726..5d6dda1190e833a198a1ac19930172c8b92c0d89 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -127,13 +127,18 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
     else if (HasFlag(wxBU_BOTTOM))
         y_alignment = 1.0;
 
     else if (HasFlag(wxBU_BOTTOM))
         y_alignment = 1.0;
 

-#if GTK_CHECK_VERSION(2,4,0)
-    gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment);
-#else
-    if (GTK_IS_MISC(BUTTON_CHILD(m_widget)))
-        gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)),
-                                x_alignment, y_alignment);
+#if __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+    {
+        gtk_button_set_alignment(GTK_BUTTON(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);
 

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index b554a0de1b6cfa7d2e5af5eb7ffd99151f7a9e18..8f63fb6f6aeb2fa9e23231a7a222083ff1f1c46a 100644 (file)
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -141,35 +141,37 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                        wildCard, style, pos, true )
 {
 #ifdef __WXGTK24__
                        wildCard, style, pos, true )
 {
 #ifdef __WXGTK24__

-    m_needParent = FALSE;
-    m_destroyed_by_delete = FALSE;
+    if (!gtk_check_version(2,4,0))
+    {
+        m_needParent = FALSE;
+        m_destroyed_by_delete = FALSE;

 
 

-    if (!PreCreation(parent, pos, wxDefaultSize) ||
-        !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style,
+        if (!PreCreation(parent, pos, wxDefaultSize) ||
+            !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style,

                     wxDefaultValidator, wxT("filedialog")))
                     wxDefaultValidator, wxT("filedialog")))

-    {
-        wxFAIL_MSG( wxT("wxFileDialog creation failed") );
-        return;
-    }
+        {
+            wxFAIL_MSG( wxT("wxFileDialog creation failed") );
+            return;
+        }

 
 

-    bool multiple = (style & wxMULTIPLE) == wxMULTIPLE;
-    GtkFileChooserAction gtk_action;
-    GtkWindow* gtk_parent = NULL;
-    if (parent)
-        gtk_parent = GTK_WINDOW(parent->m_widget);
+        bool multiple = (style & wxMULTIPLE) == wxMULTIPLE;
+        GtkFileChooserAction gtk_action;
+        GtkWindow* gtk_parent = NULL;
+        if (parent)
+            gtk_parent = GTK_WINDOW(parent->m_widget);

     
     

-    gchar* ok_btn_stock;
-    if ((style & wxSAVE) == wxSAVE)
-    {
-        gtk_action = GTK_FILE_CHOOSER_ACTION_SAVE;
-        ok_btn_stock = GTK_STOCK_SAVE;
-    }
-    else
-    {
-        gtk_action = GTK_FILE_CHOOSER_ACTION_OPEN;
-        ok_btn_stock = GTK_STOCK_OPEN;
-    }
-    m_widget = gtk_file_chooser_dialog_new(
+        gchar* ok_btn_stock;
+        if ((style & wxSAVE) == wxSAVE)
+        {
+            gtk_action = GTK_FILE_CHOOSER_ACTION_SAVE;
+            ok_btn_stock = GTK_STOCK_SAVE;
+        }
+        else
+        {
+            gtk_action = GTK_FILE_CHOOSER_ACTION_OPEN;
+            ok_btn_stock = GTK_STOCK_OPEN;
+        }
+        m_widget = gtk_file_chooser_dialog_new(

                        wxGTK_CONV(m_message),
                        gtk_parent,
                        gtk_action,
                        wxGTK_CONV(m_message),
                        gtk_parent,
                        gtk_action,


@@ -177,232 +179,262 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                        ok_btn_stock, GTK_RESPONSE_ACCEPT,
                        NULL);
 
                        ok_btn_stock, GTK_RESPONSE_ACCEPT,
                        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", 
                              GTK_SIGNAL_FUNC(gtk_filedialog_response_callback),
                              (gpointer*)this);
     
                              "response", 
                              GTK_SIGNAL_FUNC(gtk_filedialog_response_callback),
                              (gpointer*)this);
     

-    m_path = m_dir;
-    if (!m_path.empty() && m_path.Last() != wxT('/'))
-        m_path += wxT('/');
-    m_path += m_fileName;
-    SetPath(m_path);
+        m_path = m_dir;
+        if (!m_path.empty() && m_path.Last() != wxT('/'))
+            m_path += wxT('/');
+        m_path += m_fileName;
+        SetPath(m_path);

     
     

-    SetWildcard(wildCard);
-    SetFilterIndex(0);
-#else
-    wxGenericFileDialog::Create( parent, message, defaultDir, defaultFileName, wildCard, style, pos );
+        SetWildcard(wildCard);
+        SetFilterIndex(0);
+    }
+    else

 #endif
 #endif

+        wxGenericFileDialog::Create( parent, message, defaultDir, defaultFileName, wildCard, style, pos );

 }
 
 wxFileDialog::~wxFileDialog()
 {
 #ifdef __WXGTK24__
 }
 
 wxFileDialog::~wxFileDialog()
 {
 #ifdef __WXGTK24__

-    if (m_destroyed_by_delete)
-        m_widget = NULL;
+    if (!gtk_check_version(2,4,0))
+    {
+        if (m_destroyed_by_delete)
+            m_widget = NULL;
+    }

 #endif
 }
 
 void wxFileDialog::OnFakeOk( wxCommandEvent &event )
 {
 #ifdef __WXGTK24__
 #endif
 }
 
 void wxFileDialog::OnFakeOk( wxCommandEvent &event )
 {
 #ifdef __WXGTK24__

-    wxDialog::OnOK( event );
-#else
-    wxGenericFileDialog::OnListOk( event );
+    if (!gtk_check_version(2,4,0))
+        wxDialog::OnOK( event );
+    else

 #endif
 #endif

+        wxGenericFileDialog::OnListOk( event );

 }
 
 int wxFileDialog::ShowModal()
 {
 #ifdef __WXGTK24__
 }
 
 int wxFileDialog::ShowModal()
 {
 #ifdef __WXGTK24__

-    return wxDialog::ShowModal();
-#else
-    return wxGenericFileDialog::ShowModal();
+    if (!gtk_check_version(2,4,0))
+        return wxDialog::ShowModal();
+    else

 #endif
 #endif

+        return wxGenericFileDialog::ShowModal();

 }
 
 bool wxFileDialog::Show( bool show )
 {
 #ifdef __WXGTK24__
 }
 
 bool wxFileDialog::Show( bool show )
 {
 #ifdef __WXGTK24__

-    return wxDialog::Show( show );
-#else
-    return wxGenericFileDialog::Show( show );
+    if (!gtk_check_version(2,4,0))
+        return wxDialog::Show( show );
+    else

 #endif
 #endif

+        return wxGenericFileDialog::Show( show );

 }
 
 void wxFileDialog::GetFilenames(wxArrayString& files) const 
 {
 #ifdef __WXGTK24__
 }
 
 void wxFileDialog::GetFilenames(wxArrayString& files) const 
 {
 #ifdef __WXGTK24__

-    GetPaths(files);
-    for (size_t n = 0; n < files.GetCount(); n++ )
+    if (!gtk_check_version(2,4,0))

     {
     {

-        wxString name,ext;
-        wxSplitPath(files[n], NULL, &name, &ext);
-        if (!ext.IsEmpty())
+        GetPaths(files);
+        for (size_t n = 0; n < files.GetCount(); n++ )

         {
         {

-            name += wxT(".");
-            name += ext;
+            wxString name,ext;
+            wxSplitPath(files[n], NULL, &name, &ext);
+            if (!ext.IsEmpty())
+            {
+                name += wxT(".");
+                name += ext;
+            }
+            files[n] = name;

         }
         }

-        files[n] = name;

     }
     }

-#else
-    wxGenericFileDialog::GetFilenames( files );
+    else

 #endif
 #endif

+        wxGenericFileDialog::GetFilenames( files );

 }
 
 void wxFileDialog::GetPaths(wxArrayString& paths) const 
 {
 #ifdef __WXGTK24__
 }
 
 void wxFileDialog::GetPaths(wxArrayString& paths) const 
 {
 #ifdef __WXGTK24__

-    paths.Empty(); 
-    if (GetWindowStyle() & wxMULTIPLE)
+    if (!gtk_check_version(2,4,0))

     {
     {

-        GSList *gpathsi = 
-            gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(m_widget));
-        GSList *gpaths = gpathsi;
-        while (gpathsi)
+        paths.Empty(); 
+        if (GetWindowStyle() & wxMULTIPLE)

         {
         {

-            wxString file = wxGTK_CONV_BACK((gchar*) gpathsi->data);
-            paths.Add(file);
-            g_free(gpathsi->data);
-            gpathsi = gpathsi->next;
+            GSList *gpathsi = 
+                gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(m_widget));
+            GSList *gpaths = gpathsi;
+            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)
 {
 #ifdef __WXGTK24__
 }
 
 void wxFileDialog::SetMessage(const wxString& message)
 {
 #ifdef __WXGTK24__

-    m_message = message;
-    SetTitle(message);
-#else
-    wxGenericFileDialog::SetMessage( message );
+    if (!gtk_check_version(2,4,0))
+    {
+        m_message = message;
+        SetTitle(message);
+    }
+    else

 #endif    
 #endif    

+        wxGenericFileDialog::SetMessage( message );

 }
 
 void wxFileDialog::SetPath(const wxString& path)
 {
 #ifdef __WXGTK24__
 }
 
 void wxFileDialog::SetPath(const wxString& path)
 {
 #ifdef __WXGTK24__

-    if (path.empty()) return;
-
-    wxFileName fn(path);
-    m_path = fn.GetFullPath();
-    m_dir = fn.GetPath();
-    m_fileName = fn.GetFullName();
-    UpdateDialog();
-#else
-    wxGenericFileDialog::SetPath( path );
+    if (!gtk_check_version(2,4,0))
+    {
+        if (path.empty()) return;
+
+        wxFileName fn(path);
+        m_path = fn.GetFullPath();
+        m_dir = fn.GetPath();
+        m_fileName = fn.GetFullName();
+        UpdateDialog();
+    }
+    else

 #endif    
 #endif    

+        wxGenericFileDialog::SetPath( path );

 }
 
 void wxFileDialog::SetDirectory(const wxString& dir)
 {
 #ifdef __WXGTK24__
 }
 
 void wxFileDialog::SetDirectory(const wxString& dir)
 {
 #ifdef __WXGTK24__

-    if (wxDirExists(dir))
+    if (!gtk_check_version(2,4,0))

     {
     {

-        m_dir = dir;
-        m_path = wxFileName(m_dir, m_fileName).GetFullPath();
-        UpdateDialog();
+        if (wxDirExists(dir))
+        {
+            m_dir = dir;
+            m_path = wxFileName(m_dir, m_fileName).GetFullPath();
+            UpdateDialog();
+        }

     }
     }

-#else
-    wxGenericFileDialog::SetDirectory( dir );
+    else

 #endif    
 #endif    

+        wxGenericFileDialog::SetDirectory( dir );

 }
 
 void wxFileDialog::SetFilename(const wxString& name)
 {
 #ifdef __WXGTK24__
 }
 
 void wxFileDialog::SetFilename(const wxString& name)
 {
 #ifdef __WXGTK24__

-    m_fileName = name;
-    m_path = wxFileName(m_dir, m_fileName).GetFullPath();
-    UpdateDialog();
-#else
-    wxGenericFileDialog::SetFilename( name );
+    if (!gtk_check_version(2,4,0))
+    {
+        m_fileName = name;
+        m_path = wxFileName(m_dir, m_fileName).GetFullPath();
+        UpdateDialog();
+    }
+    else

 #endif
 #endif

+        wxGenericFileDialog::SetFilename( name );

 }
 
 void wxFileDialog::SetWildcard(const wxString& wildCard)
 {
 #ifdef __WXGTK24__
 }
 
 void wxFileDialog::SetWildcard(const wxString& wildCard)
 {
 #ifdef __WXGTK24__

-    m_wildCard = wildCard;
-    
-    GtkFileChooser* chooser = GTK_FILE_CHOOSER(m_widget);
-    
-    // empty current filter list:
-    GSList* ifilters = gtk_file_chooser_list_filters(chooser);
-    GSList* filters = ifilters;
-    while (ifilters)
+    if (!gtk_check_version(2,4,0))

     {
     {

-        gtk_file_chooser_remove_filter(chooser,GTK_FILE_FILTER(ifilters->data));
-        ifilters = ifilters->next;
-    }
-    g_slist_free(filters);
+        m_wildCard = wildCard;
+        GtkFileChooser* chooser = GTK_FILE_CHOOSER(m_widget);

     
     

-    // 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++)
+        // 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));
+            ifilters = ifilters->next;
+       }
+        g_slist_free(filters);
+    
+        // parse filters
+        wxArrayString wildDescriptions, wildFilters;
+        if (!wxParseCommonDialogsFilter(m_wildCard, wildDescriptions, wildFilters))
+        {
+            wxFAIL_MSG( wxT("Wrong file type description") );
+        }
+        else

         {
         {

-            GtkFileFilter* filter = gtk_file_filter_new();
-            gtk_file_filter_set_name(filter,wxGTK_CONV(wildDescriptions[n]));
-            wxString after = wildFilters[n];
-            do
+            // add parsed to GtkChooser
+            for (size_t n = 0; n < wildFilters.GetCount(); n++)

             {
             {

-                wxString ext = after.BeforeFirst(wxT(';'));
-                gtk_file_filter_add_pattern(filter,wxGTK_CONV(ext));
-                if (after.Find(wxT(';')) == wxNOT_FOUND)
-                    break;
-                after = after.AfterLast(wxT(';'));
-            }
-            while (!after.empty());
+                GtkFileFilter* filter = gtk_file_filter_new();
+                gtk_file_filter_set_name(filter,wxGTK_CONV(wildDescriptions[n]));
+                wxString after = wildFilters[n];
+                do
+                {
+                    wxString ext = after.BeforeFirst(wxT(';'));
+                    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
-    wxGenericFileDialog::SetWildcard( wildCard );
+    else

 #endif
 #endif

+        wxGenericFileDialog::SetWildcard( wildCard );

 }
 
 void wxFileDialog::SetFilterIndex(int filterIndex)
 {
 #ifdef __WXGTK24__
 }
 
 void wxFileDialog::SetFilterIndex(int filterIndex)
 {
 #ifdef __WXGTK24__

-    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)
+    if (!gtk_check_version(2,4,0))

     {
     {

-        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));
-            m_filterIndex = i;
-            break;
+            if (i == filterIndex)
+            {
+                gtk_file_chooser_set_filter(chooser, GTK_FILE_FILTER(fnode->data));
+                m_filterIndex = i;
+                break;
+            }
+            i++;
+            fnode = fnode->next;

         }
         }

-        i++;
-        fnode = fnode->next;
+        g_slist_free(filters);

     }
     }

-    g_slist_free(filters);
-#else
-    wxGenericFileDialog::SetFilterIndex( filterIndex );
+    else

 #endif
 #endif

+        wxGenericFileDialog::SetFilterIndex( filterIndex );

 }
 
 void wxFileDialog::UpdateDialog()
 }
 
 void wxFileDialog::UpdateDialog()

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 625ec9c915e42ad66e124f198ca55630f0d0b982..d91d2bf5f18dd18c468d217cd63c5da45e8060cd 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -487,16 +487,19 @@ bool wxTextCtrl::Create( wxWindow *parent,
             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
     }
             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
     }

-    // gtk_entry_set_alignment was introduced in gtk+-2.3.5
-#if GTK_CHECK_VERSION(2, 3, 5)

     else
     {
     else
     {

-        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 );
+#ifdef __WXGTK24__
+        // gtk_entry_set_alignment was introduced in gtk+-2.3.5
+        if (!gtk_check_version(2,4,0))
+        {
+            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__
     
     // We want to be notified about text changes.
 #endif // __WXGTK20__
     
     // We want to be notified about text changes.

diff --git a/src/gtk1/artgtk.cpp b/src/gtk1/artgtk.cpp
index dafc3dc2c90788a9fa0b5bd8b44c7bd6e1557000..a33fd455adcf12f66ff4dda5d81ffc556282fe64 100644 (file)
--- a/src/gtk1/artgtk.cpp
+++ b/src/gtk1/artgtk.cpp
@@ -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,
                                   GtkIconSize iconsize, const wxSize& sz)
 {
 static GdkPixbuf *CreateThemeIcon(const char *iconname,
                                   GtkIconSize iconsize, const wxSize& sz)
 {


@@ -218,7 +218,7 @@ static GdkPixbuf *CreateThemeIcon(const char *iconname,
                     size.x,
                     (GtkIconLookupFlags)0, NULL);
 }
                     size.x,
                     (GtkIconLookupFlags)0, NULL);
 }

-#endif // GTK+ >= 2.4.0
+#endif

 
 wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
                                          const wxArtClient& client,
 
 wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id,
                                          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)
-    if (!pixbuf)
-        pixbuf = CreateThemeIcon(stockid, stocksize, size);
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+    {
+        if (!pixbuf)
+            pixbuf = CreateThemeIcon(stockid, stocksize, size);
+    }

 #endif
 
     if (pixbuf && size != wxDefaultSize &&
 #endif
 
     if (pixbuf && size != wxDefaultSize &&

diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp
index 435358d25ffb4da2b54cc1402e327246d47c3726..5d6dda1190e833a198a1ac19930172c8b92c0d89 100644 (file)
--- a/src/gtk1/button.cpp
+++ b/src/gtk1/button.cpp
@@ -127,13 +127,18 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
     else if (HasFlag(wxBU_BOTTOM))
         y_alignment = 1.0;
 
     else if (HasFlag(wxBU_BOTTOM))
         y_alignment = 1.0;
 

-#if GTK_CHECK_VERSION(2,4,0)
-    gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment);
-#else
-    if (GTK_IS_MISC(BUTTON_CHILD(m_widget)))
-        gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)),
-                                x_alignment, y_alignment);
+#if __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+    {
+        gtk_button_set_alignment(GTK_BUTTON(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);
 

diff --git a/src/gtk1/filedlg.cpp b/src/gtk1/filedlg.cpp
index b554a0de1b6cfa7d2e5af5eb7ffd99151f7a9e18..8f63fb6f6aeb2fa9e23231a7a222083ff1f1c46a 100644 (file)
--- a/src/gtk1/filedlg.cpp
+++ b/src/gtk1/filedlg.cpp
@@ -141,35 +141,37 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                        wildCard, style, pos, true )
 {
 #ifdef __WXGTK24__
                        wildCard, style, pos, true )
 {
 #ifdef __WXGTK24__

-    m_needParent = FALSE;
-    m_destroyed_by_delete = FALSE;
+    if (!gtk_check_version(2,4,0))
+    {
+        m_needParent = FALSE;
+        m_destroyed_by_delete = FALSE;

 
 

-    if (!PreCreation(parent, pos, wxDefaultSize) ||
-        !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style,
+        if (!PreCreation(parent, pos, wxDefaultSize) ||
+            !CreateBase(parent, wxID_ANY, pos, wxDefaultSize, style,

                     wxDefaultValidator, wxT("filedialog")))
                     wxDefaultValidator, wxT("filedialog")))

-    {
-        wxFAIL_MSG( wxT("wxFileDialog creation failed") );
-        return;
-    }
+        {
+            wxFAIL_MSG( wxT("wxFileDialog creation failed") );
+            return;
+        }

 
 

-    bool multiple = (style & wxMULTIPLE) == wxMULTIPLE;
-    GtkFileChooserAction gtk_action;
-    GtkWindow* gtk_parent = NULL;
-    if (parent)
-        gtk_parent = GTK_WINDOW(parent->m_widget);
+        bool multiple = (style & wxMULTIPLE) == wxMULTIPLE;
+        GtkFileChooserAction gtk_action;
+        GtkWindow* gtk_parent = NULL;
+        if (parent)
+            gtk_parent = GTK_WINDOW(parent->m_widget);

     
     

-    gchar* ok_btn_stock;
-    if ((style & wxSAVE) == wxSAVE)
-    {
-        gtk_action = GTK_FILE_CHOOSER_ACTION_SAVE;
-        ok_btn_stock = GTK_STOCK_SAVE;
-    }
-    else
-    {
-        gtk_action = GTK_FILE_CHOOSER_ACTION_OPEN;
-        ok_btn_stock = GTK_STOCK_OPEN;
-    }
-    m_widget = gtk_file_chooser_dialog_new(
+        gchar* ok_btn_stock;
+        if ((style & wxSAVE) == wxSAVE)
+        {
+            gtk_action = GTK_FILE_CHOOSER_ACTION_SAVE;
+            ok_btn_stock = GTK_STOCK_SAVE;
+        }
+        else
+        {
+            gtk_action = GTK_FILE_CHOOSER_ACTION_OPEN;
+            ok_btn_stock = GTK_STOCK_OPEN;
+        }
+        m_widget = gtk_file_chooser_dialog_new(

                        wxGTK_CONV(m_message),
                        gtk_parent,
                        gtk_action,
                        wxGTK_CONV(m_message),
                        gtk_parent,
                        gtk_action,


@@ -177,232 +179,262 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
                        ok_btn_stock, GTK_RESPONSE_ACCEPT,
                        NULL);
 
                        ok_btn_stock, GTK_RESPONSE_ACCEPT,
                        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", 
                              GTK_SIGNAL_FUNC(gtk_filedialog_response_callback),
                              (gpointer*)this);
     
                              "response", 
                              GTK_SIGNAL_FUNC(gtk_filedialog_response_callback),
                              (gpointer*)this);
     

-    m_path = m_dir;
-    if (!m_path.empty() && m_path.Last() != wxT('/'))
-        m_path += wxT('/');
-    m_path += m_fileName;
-    SetPath(m_path);
+        m_path = m_dir;
+        if (!m_path.empty() && m_path.Last() != wxT('/'))
+            m_path += wxT('/');
+        m_path += m_fileName;
+        SetPath(m_path);

     
     

-    SetWildcard(wildCard);
-    SetFilterIndex(0);
-#else
-    wxGenericFileDialog::Create( parent, message, defaultDir, defaultFileName, wildCard, style, pos );
+        SetWildcard(wildCard);
+        SetFilterIndex(0);
+    }
+    else

 #endif
 #endif

+        wxGenericFileDialog::Create( parent, message, defaultDir, defaultFileName, wildCard, style, pos );

 }
 
 wxFileDialog::~wxFileDialog()
 {
 #ifdef __WXGTK24__
 }
 
 wxFileDialog::~wxFileDialog()
 {
 #ifdef __WXGTK24__

-    if (m_destroyed_by_delete)
-        m_widget = NULL;
+    if (!gtk_check_version(2,4,0))
+    {
+        if (m_destroyed_by_delete)
+            m_widget = NULL;
+    }

 #endif
 }
 
 void wxFileDialog::OnFakeOk( wxCommandEvent &event )
 {
 #ifdef __WXGTK24__
 #endif
 }
 
 void wxFileDialog::OnFakeOk( wxCommandEvent &event )
 {
 #ifdef __WXGTK24__

-    wxDialog::OnOK( event );
-#else
-    wxGenericFileDialog::OnListOk( event );
+    if (!gtk_check_version(2,4,0))
+        wxDialog::OnOK( event );
+    else

 #endif
 #endif

+        wxGenericFileDialog::OnListOk( event );

 }
 
 int wxFileDialog::ShowModal()
 {
 #ifdef __WXGTK24__
 }
 
 int wxFileDialog::ShowModal()
 {
 #ifdef __WXGTK24__

-    return wxDialog::ShowModal();
-#else
-    return wxGenericFileDialog::ShowModal();
+    if (!gtk_check_version(2,4,0))
+        return wxDialog::ShowModal();
+    else

 #endif
 #endif

+        return wxGenericFileDialog::ShowModal();

 }
 
 bool wxFileDialog::Show( bool show )
 {
 #ifdef __WXGTK24__
 }
 
 bool wxFileDialog::Show( bool show )
 {
 #ifdef __WXGTK24__

-    return wxDialog::Show( show );
-#else
-    return wxGenericFileDialog::Show( show );
+    if (!gtk_check_version(2,4,0))
+        return wxDialog::Show( show );
+    else

 #endif
 #endif

+        return wxGenericFileDialog::Show( show );

 }
 
 void wxFileDialog::GetFilenames(wxArrayString& files) const 
 {
 #ifdef __WXGTK24__
 }
 
 void wxFileDialog::GetFilenames(wxArrayString& files) const 
 {
 #ifdef __WXGTK24__

-    GetPaths(files);
-    for (size_t n = 0; n < files.GetCount(); n++ )
+    if (!gtk_check_version(2,4,0))

     {
     {

-        wxString name,ext;
-        wxSplitPath(files[n], NULL, &name, &ext);
-        if (!ext.IsEmpty())
+        GetPaths(files);
+        for (size_t n = 0; n < files.GetCount(); n++ )

         {
         {

-            name += wxT(".");
-            name += ext;
+            wxString name,ext;
+            wxSplitPath(files[n], NULL, &name, &ext);
+            if (!ext.IsEmpty())
+            {
+                name += wxT(".");
+                name += ext;
+            }
+            files[n] = name;

         }
         }

-        files[n] = name;

     }
     }

-#else
-    wxGenericFileDialog::GetFilenames( files );
+    else

 #endif
 #endif

+        wxGenericFileDialog::GetFilenames( files );

 }
 
 void wxFileDialog::GetPaths(wxArrayString& paths) const 
 {
 #ifdef __WXGTK24__
 }
 
 void wxFileDialog::GetPaths(wxArrayString& paths) const 
 {
 #ifdef __WXGTK24__

-    paths.Empty(); 
-    if (GetWindowStyle() & wxMULTIPLE)
+    if (!gtk_check_version(2,4,0))

     {
     {

-        GSList *gpathsi = 
-            gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(m_widget));
-        GSList *gpaths = gpathsi;
-        while (gpathsi)
+        paths.Empty(); 
+        if (GetWindowStyle() & wxMULTIPLE)

         {
         {

-            wxString file = wxGTK_CONV_BACK((gchar*) gpathsi->data);
-            paths.Add(file);
-            g_free(gpathsi->data);
-            gpathsi = gpathsi->next;
+            GSList *gpathsi = 
+                gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(m_widget));
+            GSList *gpaths = gpathsi;
+            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)
 {
 #ifdef __WXGTK24__
 }
 
 void wxFileDialog::SetMessage(const wxString& message)
 {
 #ifdef __WXGTK24__

-    m_message = message;
-    SetTitle(message);
-#else
-    wxGenericFileDialog::SetMessage( message );
+    if (!gtk_check_version(2,4,0))
+    {
+        m_message = message;
+        SetTitle(message);
+    }
+    else

 #endif    
 #endif    

+        wxGenericFileDialog::SetMessage( message );

 }
 
 void wxFileDialog::SetPath(const wxString& path)
 {
 #ifdef __WXGTK24__
 }
 
 void wxFileDialog::SetPath(const wxString& path)
 {
 #ifdef __WXGTK24__

-    if (path.empty()) return;
-
-    wxFileName fn(path);
-    m_path = fn.GetFullPath();
-    m_dir = fn.GetPath();
-    m_fileName = fn.GetFullName();
-    UpdateDialog();
-#else
-    wxGenericFileDialog::SetPath( path );
+    if (!gtk_check_version(2,4,0))
+    {
+        if (path.empty()) return;
+
+        wxFileName fn(path);
+        m_path = fn.GetFullPath();
+        m_dir = fn.GetPath();
+        m_fileName = fn.GetFullName();
+        UpdateDialog();
+    }
+    else

 #endif    
 #endif    

+        wxGenericFileDialog::SetPath( path );

 }
 
 void wxFileDialog::SetDirectory(const wxString& dir)
 {
 #ifdef __WXGTK24__
 }
 
 void wxFileDialog::SetDirectory(const wxString& dir)
 {
 #ifdef __WXGTK24__

-    if (wxDirExists(dir))
+    if (!gtk_check_version(2,4,0))

     {
     {

-        m_dir = dir;
-        m_path = wxFileName(m_dir, m_fileName).GetFullPath();
-        UpdateDialog();
+        if (wxDirExists(dir))
+        {
+            m_dir = dir;
+            m_path = wxFileName(m_dir, m_fileName).GetFullPath();
+            UpdateDialog();
+        }

     }
     }

-#else
-    wxGenericFileDialog::SetDirectory( dir );
+    else

 #endif    
 #endif    

+        wxGenericFileDialog::SetDirectory( dir );

 }
 
 void wxFileDialog::SetFilename(const wxString& name)
 {
 #ifdef __WXGTK24__
 }
 
 void wxFileDialog::SetFilename(const wxString& name)
 {
 #ifdef __WXGTK24__

-    m_fileName = name;
-    m_path = wxFileName(m_dir, m_fileName).GetFullPath();
-    UpdateDialog();
-#else
-    wxGenericFileDialog::SetFilename( name );
+    if (!gtk_check_version(2,4,0))
+    {
+        m_fileName = name;
+        m_path = wxFileName(m_dir, m_fileName).GetFullPath();
+        UpdateDialog();
+    }
+    else

 #endif
 #endif

+        wxGenericFileDialog::SetFilename( name );

 }
 
 void wxFileDialog::SetWildcard(const wxString& wildCard)
 {
 #ifdef __WXGTK24__
 }
 
 void wxFileDialog::SetWildcard(const wxString& wildCard)
 {
 #ifdef __WXGTK24__

-    m_wildCard = wildCard;
-    
-    GtkFileChooser* chooser = GTK_FILE_CHOOSER(m_widget);
-    
-    // empty current filter list:
-    GSList* ifilters = gtk_file_chooser_list_filters(chooser);
-    GSList* filters = ifilters;
-    while (ifilters)
+    if (!gtk_check_version(2,4,0))

     {
     {

-        gtk_file_chooser_remove_filter(chooser,GTK_FILE_FILTER(ifilters->data));
-        ifilters = ifilters->next;
-    }
-    g_slist_free(filters);
+        m_wildCard = wildCard;
+        GtkFileChooser* chooser = GTK_FILE_CHOOSER(m_widget);

     
     

-    // 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++)
+        // 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));
+            ifilters = ifilters->next;
+       }
+        g_slist_free(filters);
+    
+        // parse filters
+        wxArrayString wildDescriptions, wildFilters;
+        if (!wxParseCommonDialogsFilter(m_wildCard, wildDescriptions, wildFilters))
+        {
+            wxFAIL_MSG( wxT("Wrong file type description") );
+        }
+        else

         {
         {

-            GtkFileFilter* filter = gtk_file_filter_new();
-            gtk_file_filter_set_name(filter,wxGTK_CONV(wildDescriptions[n]));
-            wxString after = wildFilters[n];
-            do
+            // add parsed to GtkChooser
+            for (size_t n = 0; n < wildFilters.GetCount(); n++)

             {
             {

-                wxString ext = after.BeforeFirst(wxT(';'));
-                gtk_file_filter_add_pattern(filter,wxGTK_CONV(ext));
-                if (after.Find(wxT(';')) == wxNOT_FOUND)
-                    break;
-                after = after.AfterLast(wxT(';'));
-            }
-            while (!after.empty());
+                GtkFileFilter* filter = gtk_file_filter_new();
+                gtk_file_filter_set_name(filter,wxGTK_CONV(wildDescriptions[n]));
+                wxString after = wildFilters[n];
+                do
+                {
+                    wxString ext = after.BeforeFirst(wxT(';'));
+                    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
-    wxGenericFileDialog::SetWildcard( wildCard );
+    else

 #endif
 #endif

+        wxGenericFileDialog::SetWildcard( wildCard );

 }
 
 void wxFileDialog::SetFilterIndex(int filterIndex)
 {
 #ifdef __WXGTK24__
 }
 
 void wxFileDialog::SetFilterIndex(int filterIndex)
 {
 #ifdef __WXGTK24__

-    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)
+    if (!gtk_check_version(2,4,0))

     {
     {

-        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));
-            m_filterIndex = i;
-            break;
+            if (i == filterIndex)
+            {
+                gtk_file_chooser_set_filter(chooser, GTK_FILE_FILTER(fnode->data));
+                m_filterIndex = i;
+                break;
+            }
+            i++;
+            fnode = fnode->next;

         }
         }

-        i++;
-        fnode = fnode->next;
+        g_slist_free(filters);

     }
     }

-    g_slist_free(filters);
-#else
-    wxGenericFileDialog::SetFilterIndex( filterIndex );
+    else

 #endif
 #endif

+        wxGenericFileDialog::SetFilterIndex( filterIndex );

 }
 
 void wxFileDialog::UpdateDialog()
 }
 
 void wxFileDialog::UpdateDialog()

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 625ec9c915e42ad66e124f198ca55630f0d0b982..d91d2bf5f18dd18c468d217cd63c5da45e8060cd 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -487,16 +487,19 @@ bool wxTextCtrl::Create( wxWindow *parent,
             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
     }
             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
     }

-    // gtk_entry_set_alignment was introduced in gtk+-2.3.5
-#if GTK_CHECK_VERSION(2, 3, 5)

     else
     {
     else
     {

-        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 );
+#ifdef __WXGTK24__
+        // gtk_entry_set_alignment was introduced in gtk+-2.3.5
+        if (!gtk_check_version(2,4,0))
+        {
+            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__
     
     // We want to be notified about text changes.
 #endif // __WXGTK20__
     
     // We want to be notified about text changes.