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

Made wxWindowBase's variables protected again and such.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-05-10 21:04:17 +00:00
parent 36453d0ffb
commit 739730cae7
7 changed files with 258 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gtk1/dialog.cpp
View File

@@ -284,7 +284,7 @@ void wxDialog::OnCancel( wxCommandEvent &WXUNUSED(event) )
else
{
SetReturnCode(wxID_CANCEL);
this->Show(FALSE);
Show(FALSE);
}
}
@@ -296,12 +296,12 @@ void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) )
printf( "OnOK 2.\n" );
if (IsModal())
{
printf( "OnOK: modal.\n" );
printf( "OnOK: modal.\n" );
EndModal(wxID_OK);
}
else
{
printf( "OnOK: non-modal.\n" );
printf( "OnOK: non-modal.\n" );
SetReturnCode(wxID_OK);
this->Show(FALSE);
}
@@ -508,21 +508,11 @@ bool wxDialog::Show( bool show )
GtkOnSize( m_x, m_y, m_width, m_height );
}
if (show != m_isShown)
{
if (show)
{
gtk_widget_show( m_widget );
}
else
gtk_widget_hide( m_widget );
m_isShown = show;
}
bool ret = wxWindow::Show( show );
if (show) InitDialog();
return TRUE;
return ret;
}
bool wxDialog::IsModal() const