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

Fixed resize behaviour under certain circumstances.

Browse Source 
Disabled GUI threading when using GTK < 1.2.4, better
    than crashing.
  Typos corrected.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2000-01-15 14:48:00 +00:00
parent 9000c6246f
commit 8f75cb6c75
7 changed files with 79 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/gtk/window.cpp
View File

@@ -1707,6 +1707,20 @@ gtk_window_realized_callback( GtkWidget *WXUNUSED(m_widget), wxWindow *win )
// "size_allocate"
//-----------------------------------------------------------------------------
static
void gtk_window_size_callback( GtkWidget *widget,
GtkAllocation *alloc,
wxWindow *win )
{
if (g_isIdle)
wxapp_install_idle_handler();
wxSizeEvent event( win->GetSize(), win->GetId() );
event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event );
}
#ifdef HAVE_XIM
#define WXUNUSED_UNLESS_XIM(param) param
#else
@@ -1716,13 +1730,13 @@ gtk_window_realized_callback( GtkWidget *WXUNUSED(m_widget), wxWindow *win )
/* Resize XIM window */
static
void gtk_wxwindow_size_callback( GtkWidget * WXUNUSED_UNLESS_XIM(widget),
GtkAllocation * WXUNUSED_UNLESS_XIM(alloc),
wxFrame * WXUNUSED_UNLESS_XIM(win) )
void gtk_wxwindow_size_callback( GtkWidget* WXUNUSED_UNLESS_XIM(widget),
GtkAllocation* WXUNUSED_UNLESS_XIM(alloc),
wxWindow* WXUNUSED_UNLESS_XIM(win) )
{
if (g_isIdle)
wxapp_install_idle_handler();
#ifdef HAVE_XIM
if (!win->m_ic)
return;
@@ -2211,11 +2225,15 @@ void wxWindow::PostCreation()
if (m_wxwindow)
{
/* Initialize XIM support. */
/* Catch native resize events. */
gtk_signal_connect( GTK_OBJECT(m_wxwindow), "size_allocate",
GTK_SIGNAL_FUNC(gtk_window_size_callback), (gpointer)this );
/* Initialize XIM support. */
gtk_signal_connect( GTK_OBJECT(m_wxwindow), "realize",
GTK_SIGNAL_FUNC(gtk_wxwindow_realized_callback), (gpointer) this );
/* And resize XIM window. */
/* And resize XIM window. */
gtk_signal_connect( GTK_OBJECT(m_wxwindow), "size_allocate",
GTK_SIGNAL_FUNC(gtk_wxwindow_size_callback), (gpointer)this );
}