// Created: 2001/09/16
// RCS-ID: $Id$
// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_UNIV_DIALOG_H_
#define _WX_UNIV_DIALOG_H_
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "univdialog.h"
#endif
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,
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
+ // For now, same as Show(true) but returns return code
virtual int ShowModal();
// may be called to terminate the dialog with the given return code
virtual void EndModal(int retCode);
- // returns TRUE if we're in a modal loop
+ // returns true if we're in a modal loop
bool IsModalShowing() const;
- bool Show(bool show = TRUE);
+ bool Show(bool show = true);
// implementation only from now on
// -------------------------------
// 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;