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

compilation fixes for GTK+ <= 1.2.3

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 1999-11-05 13:04:13 +00:00
parent ef500a4059
commit 7e14e49f38
4 changed files with 66 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/dialog.cpp
View File

@ -118,10 +118,13 @@ gtk_dialog_realized_callback( GtkWidget *widget, wxDialog *win )
if (g_isIdle)
wxapp_install_idle_handler();
// FIXME I don't know when does it appear, but it's not in 1.2.2
#if GTK_CHECK_VERSION(1, 2, 3)
/* I haven't been able to set the position of
the dialog before it is shown, so I set the
position in "realize" */
gtk_window_reposition( GTK_WINDOW(widget), win->m_x, win->m_y );
#endif // GTK > 1.2.2
/* all this is for Motif Window Manager "hints" and is supposed to be
recognized by other WM as well. not tested. */
@ -491,6 +494,8 @@ void wxDialog::DoSetSize( int x, int y, int width, int height, int sizeFlags )
if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth;
if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight;
// FIXME I don't know when does it appear, but it's not in 1.2.2
#if GTK_CHECK_VERSION(1, 2, 3)
if ((m_x != -1) || (m_y != -1))
{
if ((m_x != old_x) || (m_y != old_y))
@ -500,6 +505,7 @@ void wxDialog::DoSetSize( int x, int y, int width, int height, int sizeFlags )
gtk_window_reposition( GTK_WINDOW(m_widget), m_x, m_y );
}
}
#endif // GTK > 1.2.2
if ((m_width != old_width) || (m_height != old_height))
{

8
src/gtk/frame.cpp
View File

@ -207,11 +207,14 @@ gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win )
if (g_isIdle)
wxapp_install_idle_handler();
// FIXME I don't know when does it appear, but it's not in 1.2.2
#if GTK_CHECK_VERSION(1, 2, 3)
/* I haven't been able to set the position of
the dialog before it is shown, so I set the
position in "realize" */
printf( "%d %d\n", win->m_x, win->m_y );
wxLogDebug( "%d %d\n", win->m_x, win->m_y );
gtk_window_reposition( GTK_WINDOW(widget), win->m_x, win->m_y );
#endif // GTK > 1.2.2
/* all this is for Motif Window Manager "hints" and is supposed to be
recognized by other WM as well. not tested. */
@ -566,6 +569,8 @@ void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth;
if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight;
// FIXME I don't know when does it appear, but it's not in 1.2.2
#if GTK_CHECK_VERSION(1, 2, 3)
if ((m_x != -1) || (m_y != -1))
{
if ((m_x != old_x) || (m_y != old_y))
@ -573,6 +578,7 @@ void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
gtk_window_reposition( GTK_WINDOW(m_widget), m_x, m_y );
}
}
#endif // GTK > 1.2.2
if ((m_width != old_width) || (m_height != old_height))
{

6
src/gtk1/dialog.cpp
View File

@ -118,10 +118,13 @@ gtk_dialog_realized_callback( GtkWidget *widget, wxDialog *win )
if (g_isIdle)
wxapp_install_idle_handler();
// FIXME I don't know when does it appear, but it's not in 1.2.2
#if GTK_CHECK_VERSION(1, 2, 3)
/* I haven't been able to set the position of
the dialog before it is shown, so I set the
position in "realize" */
gtk_window_reposition( GTK_WINDOW(widget), win->m_x, win->m_y );
#endif // GTK > 1.2.2
/* all this is for Motif Window Manager "hints" and is supposed to be
recognized by other WM as well. not tested. */
@ -491,6 +494,8 @@ void wxDialog::DoSetSize( int x, int y, int width, int height, int sizeFlags )
if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth;
if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight;
// FIXME I don't know when does it appear, but it's not in 1.2.2
#if GTK_CHECK_VERSION(1, 2, 3)
if ((m_x != -1) || (m_y != -1))
{
if ((m_x != old_x) || (m_y != old_y))
@ -500,6 +505,7 @@ void wxDialog::DoSetSize( int x, int y, int width, int height, int sizeFlags )
gtk_window_reposition( GTK_WINDOW(m_widget), m_x, m_y );
}
}
#endif // GTK > 1.2.2
if ((m_width != old_width) || (m_height != old_height))
{

8
src/gtk1/frame.cpp
View File

@ -207,11 +207,14 @@ gtk_frame_realized_callback( GtkWidget *widget, wxFrame *win )
if (g_isIdle)
wxapp_install_idle_handler();
// FIXME I don't know when does it appear, but it's not in 1.2.2
#if GTK_CHECK_VERSION(1, 2, 3)
/* I haven't been able to set the position of
the dialog before it is shown, so I set the
position in "realize" */
printf( "%d %d\n", win->m_x, win->m_y );
wxLogDebug( "%d %d\n", win->m_x, win->m_y );
gtk_window_reposition( GTK_WINDOW(widget), win->m_x, win->m_y );
#endif // GTK > 1.2.2
/* all this is for Motif Window Manager "hints" and is supposed to be
recognized by other WM as well. not tested. */
@ -566,6 +569,8 @@ void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth;
if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight;
// FIXME I don't know when does it appear, but it's not in 1.2.2
#if GTK_CHECK_VERSION(1, 2, 3)
if ((m_x != -1) || (m_y != -1))
{
if ((m_x != old_x) || (m_y != old_y))
@ -573,6 +578,7 @@ void wxFrame::DoSetSize( int x, int y, int width, int height, int sizeFlags )
gtk_window_reposition( GTK_WINDOW(m_widget), m_x, m_y );
}
}
#endif // GTK > 1.2.2
if ((m_width != old_width) || (m_height != old_height))
{