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

update minimum GTK2 version requirement to 2.6

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2012-07-10 16:39:44 +00:00
parent abac13f901
commit 4e621d2471
18 changed files with 18 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gtk/msgdlg.cpp
View File

@@ -166,19 +166,13 @@ void wxMessageDialog::GTKCreateMsgDialog()
}
wxString message;
#if GTK_CHECK_VERSION(2, 6, 0)
bool needsExtMessage = false;
if (!m_extendedMessage.empty()
#ifndef __WXGTK3__
&& gtk_check_version(2, 6, 0) == NULL
#endif
)
if (!m_extendedMessage.empty())
{
message = m_message;
needsExtMessage = true;
}
else // extended message not needed or not supported
#endif // GTK+ 2.6+
else // extended message not needed
{
message = GetFullMessage();
}
@@ -190,7 +184,6 @@ void wxMessageDialog::GTKCreateMsgDialog()
"%s",
(const char*)wxGTK_CONV(message));
#if GTK_CHECK_VERSION(2, 6, 0)
if ( needsExtMessage )
{
gtk_message_dialog_format_secondary_text
@@ -200,7 +193,6 @@ void wxMessageDialog::GTKCreateMsgDialog()
(const char *)wxGTK_CONV(m_extendedMessage)
);
}
#endif // GTK+ 2.6+
#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2/!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
g_object_ref(m_widget);