converted to 16 colors

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

diff --git a/include/wx/gtk1/dialog.h b/include/wx/gtk1/dialog.h
index 002c3e1beddd9b8c4c1a63ae7505772e3e51001c..cc3cbcac1a95744ae52768c6f2666ccbf3489472 100644 (file)
--- a/include/wx/gtk1/dialog.h
+++ b/include/wx/gtk1/dialog.h
@@ -29,18 +29,18 @@ class wxDialog;
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-extern const char *wxDialogNameStr;
+extern const wxChar *wxDialogNameStr;

 
 //-----------------------------------------------------------------------------
 // wxDialog
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxDialog
 //-----------------------------------------------------------------------------
 

-class wxDialog: public wxPanel
+class wxDialog: public wxDialogBase

 {
     DECLARE_DYNAMIC_CLASS(wxDialog)
 
 public:
 {
     DECLARE_DYNAMIC_CLASS(wxDialog)
 
 public:

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

     wxDialog( wxWindow *parent, wxWindowID id,
             const wxString &title,
             const wxPoint &pos = wxDefaultPosition,
     wxDialog( wxWindow *parent, wxWindowID id,
             const wxString &title,
             const wxPoint &pos = wxDefaultPosition,


@@ -97,6 +97,9 @@ public:
     wxIcon     m_icon;
 
 protected:
     wxIcon     m_icon;
 
 protected:

+    // common part of all ctors
+    void Init();
+

     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);