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

Backgrounds work again

Browse Source 
splitter sample compiles with Unicode
  if a wxClientDC is used on an unrealized widget,
    the widget's realization is forced in wxClientDC
  added underscores to wxMenuBar - don't work..
  tried to figure out why wxFrame doesn't get keyboard input


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-04-25 15:10:52 +00:00
parent eea4f86a0c
commit 1e133b7d64
11 changed files with 330 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gtk1/frame.cpp
View File

@@ -249,13 +249,6 @@ static void wxInsertChildInFrame( wxWindow* parent, wxWindow* child )
/* resize on OnInternalIdle */
parent->m_sizeSet = FALSE;
if (parent->m_windowStyle & wxTAB_TRAVERSAL)
{
/* we now allow a window to get the focus as long as it
doesn't have any children. */
GTK_WIDGET_UNSET_FLAGS( parent->m_wxwindow, GTK_CAN_FOCUS );
}
}
//-----------------------------------------------------------------------------
@@ -335,8 +328,14 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
/* m_wxwindow only represents the client area without toolbar and menubar */
m_wxwindow = gtk_myfixed_new();
gtk_widget_show( m_wxwindow );
GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
gtk_container_add( GTK_CONTAINER(m_mainWidget), m_wxwindow );
/* we allow the frame to get the focus as otherwise no
keye vents will get sent to it. the point with this is
that the menu's key accelerators work by interceting
key events here */
GTK_WIDGET_SET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
GTK_WIDGET_SET_FLAGS (m_wxwindow, GTK_HAS_FOCUS);
if (m_parent) m_parent->AddChild( this );
@@ -763,6 +762,11 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar )
if (m_frameMenuBar)
{
/* support for native key accelerators indicated by underscroes */
#if (GTK_MINOR_VERSION > 0) && (GTK_MICRO_VERSION > 0)
gtk_accel_group_attach( m_frameMenuBar->m_accel, GTK_OBJECT(m_wxwindow));
#endif
wxNode *node = m_frameMenuBar->GetMenus().First();
while (node)
{
@@ -788,6 +792,7 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar )
}
}
/* resize window in OnInternalIdle */
m_sizeSet = FALSE;
}