Remove unneeded wxTLW child inserter function.
Simplify wxFrame child inserter. Use the same signature for all the child inserters. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2272,7 +2272,7 @@ void wxWindowGTK::Init()
|
||||
|
||||
m_resizing = false;
|
||||
|
||||
m_insertCallback = (wxInsertChildFunction) NULL;
|
||||
m_insertCallback = wxInsertChildInWindow;
|
||||
|
||||
m_hasFocus = false;
|
||||
|
||||
@@ -2317,9 +2317,6 @@ bool wxWindowGTK::Create( wxWindow *parent,
|
||||
return false;
|
||||
}
|
||||
|
||||
m_insertCallback = wxInsertChildInWindow;
|
||||
|
||||
|
||||
if (!HasFlag(wxHSCROLL) && !HasFlag(wxVSCROLL))
|
||||
{
|
||||
m_wxwindow = gtk_pizza_new_no_scroll();
|
||||
@@ -3305,11 +3302,8 @@ bool wxWindowGTK::Reparent( wxWindowBase *newParentBase )
|
||||
void wxWindowGTK::DoAddChild(wxWindowGTK *child)
|
||||
{
|
||||
wxASSERT_MSG( (m_widget != NULL), wxT("invalid window") );
|
||||
|
||||
wxASSERT_MSG( (child != NULL), wxT("invalid child window") );
|
||||
|
||||
wxASSERT_MSG( (m_insertCallback != NULL), wxT("invalid child insertion function") );
|
||||
|
||||
/* add to list */
|
||||
AddChild( child );
|
||||
|
||||
|
Reference in New Issue
Block a user