wxMSWUniv wxWindowMSW vs. wxWindow fix.

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

diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h
index 0c7ea69240d7b9c53fcde8de6d0f8b3d6bd81b05..9f30a1c8d8426a2295d9e2f2252008ef95dbd75d 100644 (file)
--- a/include/wx/gtk/dialog.h
+++ b/include/wx/gtk/dialog.h
@@ -11,13 +11,11 @@
 #ifndef __GTKDIALOGH__
 #define __GTKDIALOGH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface
 #endif
 
 #include "wx/defs.h"
-#include "wx/panel.h"
-#include "wx/icon.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -29,78 +27,57 @@ class wxDialog;
 // global data
 //-----------------------------------------------------------------------------
 
-extern const char *wxDialogNameStr;
+extern const wxChar *wxDialogNameStr;
 
 //-----------------------------------------------------------------------------
 // wxDialog
 //-----------------------------------------------------------------------------
 
-class wxDialog: public wxPanel
+class wxDialog: public wxDialogBase
 {
-  DECLARE_DYNAMIC_CLASS(wxDialog)
-
 public:
-  wxDialog();
-  wxDialog( wxWindow *parent, wxWindowID id,
+    wxDialog() { Init(); }
+    wxDialog( wxWindow *parent, wxWindowID id,
+            const wxString &title,
+            const wxPoint &pos = wxDefaultPosition,
+            const wxSize &size = wxDefaultSize,
+            long style = wxDEFAULT_DIALOG_STYLE,
+            const wxString &name = wxDialogNameStr );
+    bool Create( wxWindow *parent, wxWindowID id,
             const wxString &title,
             const wxPoint &pos = wxDefaultPosition,
             const wxSize &size = wxDefaultSize,
             long style = wxDEFAULT_DIALOG_STYLE,
             const wxString &name = wxDialogNameStr );
-  bool Create( wxWindow *parent, wxWindowID id,
-               const wxString &title,
-               const wxPoint &pos = wxDefaultPosition,
-               const wxSize &size = wxDefaultSize,
-               long style = wxDEFAULT_DIALOG_STYLE,
-               const wxString &name = wxDialogNameStr );
-  ~wxDialog();
-
-  void SetTitle(const wxString& title);
-  wxString GetTitle() const;
-
-  void OnApply( wxCommandEvent &event );
-  void OnCancel( wxCommandEvent &event );
-  void OnOK( wxCommandEvent &event );
-  void OnPaint( wxPaintEvent& event );
-  void OnSize( wxSizeEvent &event );
-  void OnCloseWindow( wxCloseEvent& event );
-/*
-  void OnCharHook( wxKeyEvent& event );
-*/
-
-  bool Destroy();
-
-  virtual void SetSize( int x, int y, int width, int height,
-      int sizeFlags = wxSIZE_AUTO );
-  virtual void SetSize( int width, int height );
-
-  virtual bool Show( bool show );
-  virtual int ShowModal();
-  virtual void EndModal( int retCode );
-  virtual bool IsModal() const;
-  void SetModal( bool modal );
-
-  virtual void InitDialog(void);
-
-  virtual void Centre( int direction = wxHORIZONTAL );
-
-  virtual void SetIcon( const wxIcon &icon );
-  virtual void Iconize( bool WXUNUSED(iconize)) { }
-  virtual bool IsIconized() const { return FALSE; }
-  bool Iconized() const { return IsIconized(); }
-  virtual void Maximize() { }
-  virtual void Restore() { }
-
-// implementation
-
-  virtual void GtkOnSize( int x, int y, int width, int height );
-  virtual void OnInternalIdle();
-
-  bool       m_modalShowing;
-  wxString   m_title;
-  wxIcon     m_icon;
-
-  DECLARE_EVENT_TABLE()
+    ~wxDialog() {}
+
+    void OnApply( wxCommandEvent &event );
+    void OnCancel( wxCommandEvent &event );
+    void OnOK( wxCommandEvent &event );
+    void OnPaint( wxPaintEvent& event );
+    void OnCloseWindow( wxCloseEvent& event );
+    /*
+       void OnCharHook( wxKeyEvent& event );
+     */
+
+    virtual bool Show( bool show = TRUE );
+    virtual int ShowModal();
+    virtual void EndModal( int retCode );
+    virtual bool IsModal() const;
+    void SetModal( bool modal );
+
+    // implementation
+    // --------------
+
+    bool       m_modalShowing;
+
+protected:
+    // common part of all ctors
+    void Init();
+
+private:
+    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxDialog)
 };
 
 #endif // __GTKDIALOGH__