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

Resize fine tuning

Browse Source 
thread_list no longer keyed


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-11-25 19:42:48 +00:00
parent 031b2a7b8d
commit 7be4c5946c
6 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gtk/frame.cpp
View File

@@ -285,8 +285,6 @@ void wxFrame::SetSize( int x, int y, int width, int height, int sizeFlags )
gtk_widget_set_usize( m_widget, m_width, m_height );
}
m_sizeSet = TRUE;
wxSizeEvent event( wxSize(m_width,m_height), GetId() );
event.SetEventObject( this );
GetEventHandler()->ProcessEvent( event );
@@ -454,7 +452,7 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
// yes: set it's size to fill all the frame
int client_x, client_y;
GetClientSize( &client_x, &client_y );
child->SetSize( 1, 1, client_x-2, client_y);
child->SetSize( 1, 1, client_x-2, client_y-2 );
}
}
@@ -495,6 +493,8 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar )
m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y );
}
}
if (m_sizeSet) GtkOnSize( m_x, m_y, m_width, m_height );
}
wxMenuBar *wxFrame::GetMenuBar(void) const
@@ -512,6 +512,8 @@ wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& nam
GetChildren()->DeleteObject( m_frameToolBar );
if (m_sizeSet) GtkOnSize( m_x, m_y, m_width, m_height );
return m_frameToolBar;
}
@@ -533,6 +535,8 @@ wxStatusBar* wxFrame::CreateStatusBar( int number, long style, wxWindowID id, co
m_frameStatusBar = OnCreateStatusBar( number, style, id, name );
if (m_sizeSet) GtkOnSize( m_x, m_y, m_width, m_height );
return m_frameStatusBar;
}

2
src/gtk/threadpsx.cpp
View File

@@ -380,7 +380,7 @@ public:
wxMainMutex = new wxMutex();
wxThreadGuiInit();
p_mainid = pthread_self();
p_threads_list = wxList(wxKEY_INTEGER);
// p_threads_list = wxList(wxKEY_INTEGER);
wxMainMutex->Lock();
return TRUE;

10
src/gtk/window.cpp
View File

@@ -186,15 +186,15 @@ static void gtk_window_draw_callback( GtkWidget *WXUNUSED(widget), GdkRectangle
static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxWindow *win )
{
printf( "OnKeyPress.\n " );
if (!win->HasVMT()) return FALSE;
if (g_blockEventsOnDrag) return FALSE;
/*
printf( "OnKeyPress from " );
if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
printf( win->GetClassInfo()->GetClassName() );
printf( ".\n" );
*/
long key_code = 0;
switch (gdk_event->keyval)
@@ -286,19 +286,13 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
event.m_y = 0;
event.SetEventObject( win );
printf( "process key.\n" );
bool ret = win->GetEventHandler()->ProcessEvent( event );
printf( "no handler.\n" );
if (!ret)
{
wxWindow *ancestor = win;
while (ancestor)
{
printf( "check accel in %s .\n", WXSTRINGCAST ancestor->GetName() );
int command = ancestor->GetAcceleratorTable()->GetCommand( event );
if (command != -1)
{

10
src/gtk1/frame.cpp
View File

@@ -285,8 +285,6 @@ void wxFrame::SetSize( int x, int y, int width, int height, int sizeFlags )
gtk_widget_set_usize( m_widget, m_width, m_height );
}
m_sizeSet = TRUE;
wxSizeEvent event( wxSize(m_width,m_height), GetId() );
event.SetEventObject( this );
GetEventHandler()->ProcessEvent( event );
@@ -454,7 +452,7 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
// yes: set it's size to fill all the frame
int client_x, client_y;
GetClientSize( &client_x, &client_y );
child->SetSize( 1, 1, client_x-2, client_y);
child->SetSize( 1, 1, client_x-2, client_y-2 );
}
}
@@ -495,6 +493,8 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar )
m_frameMenuBar->m_widget, m_frameMenuBar->m_x, m_frameMenuBar->m_y );
}
}
if (m_sizeSet) GtkOnSize( m_x, m_y, m_width, m_height );
}
wxMenuBar *wxFrame::GetMenuBar(void) const
@@ -512,6 +512,8 @@ wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& nam
GetChildren()->DeleteObject( m_frameToolBar );
if (m_sizeSet) GtkOnSize( m_x, m_y, m_width, m_height );
return m_frameToolBar;
}
@@ -533,6 +535,8 @@ wxStatusBar* wxFrame::CreateStatusBar( int number, long style, wxWindowID id, co
m_frameStatusBar = OnCreateStatusBar( number, style, id, name );
if (m_sizeSet) GtkOnSize( m_x, m_y, m_width, m_height );
return m_frameStatusBar;
}

2
src/gtk1/threadpsx.cpp
View File

@@ -380,7 +380,7 @@ public:
wxMainMutex = new wxMutex();
wxThreadGuiInit();
p_mainid = pthread_self();
p_threads_list = wxList(wxKEY_INTEGER);
// p_threads_list = wxList(wxKEY_INTEGER);
wxMainMutex->Lock();
return TRUE;

10
src/gtk1/window.cpp
View File

@@ -186,15 +186,15 @@ static void gtk_window_draw_callback( GtkWidget *WXUNUSED(widget), GdkRectangle
static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxWindow *win )
{
printf( "OnKeyPress.\n " );
if (!win->HasVMT()) return FALSE;
if (g_blockEventsOnDrag) return FALSE;
/*
printf( "OnKeyPress from " );
if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
printf( win->GetClassInfo()->GetClassName() );
printf( ".\n" );
*/
long key_code = 0;
switch (gdk_event->keyval)
@@ -286,19 +286,13 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
event.m_y = 0;
event.SetEventObject( win );
printf( "process key.\n" );
bool ret = win->GetEventHandler()->ProcessEvent( event );
printf( "no handler.\n" );
if (!ret)
{
wxWindow *ancestor = win;
while (ancestor)
{
printf( "check accel in %s .\n", WXSTRINGCAST ancestor->GetName() );
int command = ancestor->GetAcceleratorTable()->GetCommand( event );
if (command != -1)
{