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

compilation fix for GTK2 < 2.4

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-08-15 18:39:25 +00:00
parent 66d8fe7712
commit a650b927da
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gtk/button.cpp
View File

@@ -127,11 +127,12 @@ 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;
#ifdef __WXGTK20__ #if GTK_CHECK_VERSION(2,4,0)
gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment); gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment);
#else #else
gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)), if (GTK_IS_MISC(BUTTON_CHILD(m_widget)))
x_alignment, y_alignment); gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)),
x_alignment, y_alignment);
#endif #endif
if (!label.empty()) if (!label.empty())

7
src/gtk1/button.cpp
View File

@@ -127,11 +127,12 @@ 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;
#ifdef __WXGTK20__ #if GTK_CHECK_VERSION(2,4,0)
gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment); gtk_button_set_alignment(GTK_BUTTON(m_widget), x_alignment, y_alignment);
#else #else
gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)), if (GTK_IS_MISC(BUTTON_CHILD(m_widget)))
x_alignment, y_alignment); gtk_misc_set_alignment (GTK_MISC (BUTTON_CHILD (m_widget)),
x_alignment, y_alignment);
#endif #endif
if (!label.empty()) if (!label.empty())