Compilation fix (CreateTimerImpl is taken from timerunx.cpp, so not inline).

[wxWidgets.git] / include / wx / univ / dialog.h

diff --git a/include/wx/univ/dialog.h b/include/wx/univ/dialog.h
index fe7dfe70034a56de1a58e86286e3f21580475b6f..1579a3744e66a6b4227494176126e49dc51010a3 100644 (file)
--- a/include/wx/univ/dialog.h
+++ b/include/wx/univ/dialog.h
@@ -11,13 +11,9 @@
 #ifndef _WX_UNIV_DIALOG_H_
 #define _WX_UNIV_DIALOG_H_
 
 #ifndef _WX_UNIV_DIALOG_H_
 #define _WX_UNIV_DIALOG_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "univdialog.h"
-#endif
-
-WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
-class WXDLLEXPORT wxWindowDisabler;
-class WXDLLEXPORT wxEventLoop;
+extern WXDLLEXPORT_DATA(const char) wxDialogNameStr[];
+class WXDLLIMPEXP_FWD_CORE wxWindowDisabler;
+class WXDLLIMPEXP_FWD_CORE wxEventLoop;

 
 // Dialog boxes
 class WXDLLEXPORT wxDialog : public wxDialogBase
 
 // Dialog boxes
 class WXDLLEXPORT wxDialog : public wxDialogBase


@@ -49,16 +45,16 @@ public:
     // is the dialog in modal state right now?
     virtual bool IsModal() const;
 
     // 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);
 
     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 IsModalShowing() const;
 

-    bool Show(bool show = TRUE);
+    virtual bool Show(bool show = true);

 
     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------