compilation fix for GTK2 < 2.4

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

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index e3a010662fea6e5093544a71b8e79eceae6cc0f7..7b8ef4ed8c9a41c73486b1c1da369a3e7bb0773e 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -127,11 +127,12 @@ 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;
 

-#ifdef __WXGTK20__
+#if GTK_CHECK_VERSION(2,4,0)

     gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment);
 #else
     gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment);
 #else

-    gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)),
-                            x_alignment, y_alignment);
+    if (GTK_IS_MISC(BUTTON_CHILD(m_widget)))
+        gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)),
+                                x_alignment, y_alignment);

 #endif
 
     if (!label.empty())
 #endif
 
     if (!label.empty())

diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp
index e3a010662fea6e5093544a71b8e79eceae6cc0f7..7b8ef4ed8c9a41c73486b1c1da369a3e7bb0773e 100644 (file)
--- a/src/gtk1/button.cpp
+++ b/src/gtk1/button.cpp
@@ -127,11 +127,12 @@ 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;
 

-#ifdef __WXGTK20__
+#if GTK_CHECK_VERSION(2,4,0)

     gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment);
 #else
     gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment);
 #else

-    gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)),
-                            x_alignment, y_alignment);
+    if (GTK_IS_MISC(BUTTON_CHILD(m_widget)))
+        gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)),
+                                x_alignment, y_alignment);

 #endif
 
     if (!label.empty())
 #endif
 
     if (!label.empty())