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

wxGTK fixes for the yesterday's addition of m_isWindow flag

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-02-24 13:15:42 +00:00
parent 21f280f4ec
commit 68995f26e8
8 changed files with 42 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gtk/window.cpp
View File

@@ -1309,8 +1309,10 @@ BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)
EVT_KEY_DOWN(wxWindow::OnKeyDown)
END_EVENT_TABLE()
wxWindow::wxWindow()
void wxWindow::Init()
{
m_isWindow = TRUE;
m_widget = (GtkWidget *) NULL;
m_wxwindow = (GtkWidget *) NULL;
m_parent = (wxWindow *) NULL;
@@ -1377,11 +1379,17 @@ wxWindow::wxWindow()
#endif // wxUSE_TOOLTIPS
}
wxWindow::wxWindow()
{
Init();
}
wxWindow::wxWindow( wxWindow *parent, wxWindowID id,
const wxPoint &pos, const wxSize &size,
long style, const wxString &name )
{
m_insertCallback = wxInsertChildInWindow;
Init();
Create( parent, id, pos, size, style, name );
}
@@ -1389,9 +1397,7 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id,
const wxPoint &pos, const wxSize &size,
long style, const wxString &name )
{
m_isShown = FALSE;
m_isEnabled = TRUE;
m_needParent = TRUE;
wxASSERT_MSG( m_isWindow, "Init() must have been called before!" );
PreCreation( parent, id, pos, size, style, name );