AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed a couple of obsolete functions from wxDialog

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2003-01-02 18:39:32 +00:00
parent 47710b3b4f
commit a562f4fbde
2 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/wx/univ/dialog.h
View File

@ -25,21 +25,6 @@ class WXDLLEXPORT wxDialog : public wxDialogBase
public:
wxDialog() { Init(); }
// Constructor with a modal flag, but no window id - the old convention
wxDialog(wxWindow *parent,
const wxString& title, bool modal,
int x = -1, int y= -1, int width = 500, int height = 500,
long style = wxDEFAULT_DIALOG_STYLE,
const wxString& name = wxDialogNameStr)
{
long modalStyle = modal ? wxDIALOG_MODAL : wxDIALOG_MODELESS ;
Init();
Create(parent, -1, title, wxPoint(x, y), wxSize(width, height),
style | modalStyle, name);
}
~wxDialog();
// Constructor with no modal flag - the new convention.
wxDialog(wxWindow *parent, wxWindowID id,
const wxString& title,
@ -59,7 +44,9 @@ public:
long style = wxDEFAULT_DIALOG_STYLE,
const wxString& name = wxDialogNameStr);
void SetModal(bool flag);
virtual ~wxDialog();
// is the dialog in modal state right now?
virtual bool IsModal() const;
// For now, same as Show(TRUE) but returns return code
@ -90,8 +77,10 @@ private:
// while we are showing a modal dialog we disable the other windows using
// this object
wxWindowDisabler *m_windowDisabler;
// modal dialog runs its own event loop
wxEventLoop *m_eventLoop;
// is modal right now?
bool m_isShowingModal;

5
src/univ/dialog.cpp
View File

@ -166,11 +166,6 @@ bool wxDialog::IsModal() const
return m_isShowingModal;
}
void wxDialog::SetModal(bool WXUNUSED(flag))
{
wxFAIL_MSG( wxT("wxDialog:SetModal obsolete now") );
}
int wxDialog::ShowModal()
{
if ( IsModal() )