From 370dc79c5a7fd9ac24fb001e38388a210750e2e7 Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Fri, 3 Feb 2006 21:51:21 +0000 Subject: [PATCH] GTK2: gtk_widget_set_usize -> gtk_widget_set_size_request git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/combobox.cpp | 2 +- src/gtk/dnd.cpp | 2 +- src/gtk/popupwin.cpp | 2 +- src/gtk/spinbutt.cpp | 2 +- src/gtk/win_gtk.c | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp index 6c59b8f52d..ae8f2760a2 100644 --- a/src/gtk/combobox.cpp +++ b/src/gtk/combobox.cpp @@ -290,7 +290,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, // This is required for tool bar support // wxSize setsize = GetSize(); -// gtk_widget_set_usize( m_widget, setsize.x, setsize.y ); +// gtk_widget_set_size_request( m_widget, setsize.x, setsize.y ); return true; } diff --git a/src/gtk/dnd.cpp b/src/gtk/dnd.cpp index a6922b83ee..b9e4d38b87 100644 --- a/src/gtk/dnd.cpp +++ b/src/gtk/dnd.cpp @@ -822,7 +822,7 @@ void wxDropSource::PrepareIcon( int action, GdkDragContext *context ) gtk_widget_pop_colormap (); - gtk_widget_set_usize (m_iconWindow, width, height); + gtk_widget_set_size_request (m_iconWindow, width, height); gtk_widget_realize (m_iconWindow); g_signal_connect (m_iconWindow, "configure_event", diff --git a/src/gtk/popupwin.cpp b/src/gtk/popupwin.cpp index 20a117b973..340954afb1 100644 --- a/src/gtk/popupwin.cpp +++ b/src/gtk/popupwin.cpp @@ -288,7 +288,7 @@ void wxPopupWindow::DoSetSize( int x, int y, int width, int height, int sizeFlag if ((m_width != old_width) || (m_height != old_height)) { - gtk_widget_set_usize( m_widget, m_width, m_height ); + gtk_widget_set_size_request( m_widget, m_width, m_height ); /* actual resizing is deferred to GtkOnSize in idle time and when showing the dialog */ diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp index 1088045251..578c98ee77 100644 --- a/src/gtk/spinbutt.cpp +++ b/src/gtk/spinbutt.cpp @@ -208,7 +208,7 @@ void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) ) wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") ); m_width = DoGetBestSize().x; - gtk_widget_set_usize( m_widget, m_width, m_height ); + gtk_widget_set_size_request( m_widget, m_width, m_height ); } bool wxSpinButton::IsOwnGtkWindow( GdkWindow *window ) diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c index 6a1047d6f2..c505270cdc 100644 --- a/src/gtk/win_gtk.c +++ b/src/gtk/win_gtk.c @@ -306,7 +306,7 @@ gtk_pizza_put (GtkPizza *pizza, gtk_widget_set_parent (widget, GTK_WIDGET (pizza)); - gtk_widget_set_usize (widget, width, height); + gtk_widget_set_size_request (widget, width, height); } void @@ -370,7 +370,7 @@ gtk_pizza_resize (GtkPizza *pizza, child->width = width; child->height = height; - gtk_widget_set_usize (widget, width, height); + gtk_widget_set_size_request (widget, width, height); if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (pizza)) gtk_widget_queue_resize (widget); @@ -412,7 +412,7 @@ gtk_pizza_set_size (GtkPizza *pizza, child->width = width; child->height = height; - gtk_widget_set_usize (widget, width, height); + gtk_widget_set_size_request (widget, width, height); if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (pizza)) gtk_widget_queue_resize (widget); -- 2.47.2