Fix for link error

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

diff --git a/include/wx/univ/dialog.h b/include/wx/univ/dialog.h
index 7bf987c18e052428a99f16801c27ee650f3e0a34..6d92ff6d86ec477df2b893c294c3e66b20c42262 100644 (file)
--- a/include/wx/univ/dialog.h
+++ b/include/wx/univ/dialog.h
@@ -15,7 +15,7 @@
     #pragma interface "univdialog.h"
 #endif
 
     #pragma interface "univdialog.h"
 #endif
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxDialogNameStr;

 class WXDLLEXPORT wxWindowDisabler;
 class WXDLLEXPORT wxEventLoop;
 
 class WXDLLEXPORT wxWindowDisabler;
 class WXDLLEXPORT wxEventLoop;
 


@@ -23,7 +23,7 @@ class WXDLLEXPORT wxEventLoop;
 class WXDLLEXPORT wxDialog : public wxDialogBase
 {
 public:
 class WXDLLEXPORT wxDialog : public wxDialogBase
 {
 public:

-    wxDialog();
+    wxDialog() { Init(); }

 
     // Constructor with no modal flag - the new convention.
     wxDialog(wxWindow *parent, wxWindowID id,
 
     // Constructor with no modal flag - the new convention.
     wxDialog(wxWindow *parent, wxWindowID id,


@@ -31,7 +31,11 @@ public:
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = wxDEFAULT_DIALOG_STYLE,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = wxDEFAULT_DIALOG_STYLE,

-             const wxString& name = wxDialogNameStr);
+             const wxString& name = wxDialogNameStr)
+    {
+        Init();
+        Create(parent, id, title, pos, size, style, name);
+    }

 
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxString& title,
 
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxString& title,


@@ -45,16 +49,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
     // -------------------------------