Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h
index 002c3e1beddd9b8c4c1a63ae7505772e3e51001c..bc6e8625bdef0d0709f11863f1a3ae95a40cbbc1 100644 (file)
--- a/include/wx/gtk/dialog.h
+++ b/include/wx/gtk/dialog.h
@@ -1,46 +1,25 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dialog.h
+// Name:        wx/gtk/dialog.h

 // Purpose:
 // Author:      Robert Roebling
 // Created:
 // Purpose:
 // Author:      Robert Roebling
 // Created:

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKDIALOGH__
-#define __GTKDIALOGH__
+#ifndef _WX_GTKDIALOG_H_
+#define _WX_GTKDIALOG_H_

 
 

-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "wx/defs.h"
-#include "wx/panel.h"
-#include "wx/icon.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxDialog;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const char *wxDialogNameStr;
+class WXDLLIMPEXP_FWD_CORE wxGUIEventLoop;

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

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

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxDialog)
-

 public:
 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,


@@ -53,56 +32,23 @@ public:
             const wxSize &size = wxDefaultSize,
             long style = wxDEFAULT_DIALOG_STYLE,
             const wxString &name = wxDialogNameStr );
             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 );
-     */
+    virtual ~wxDialog();

 
 

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

     virtual int ShowModal();
     virtual void EndModal( int retCode );
     virtual bool IsModal() const;
     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
 
     // implementation

-
-    virtual void GtkOnSize( int x, int y, int width, int height );
-    virtual void OnInternalIdle();
+    // --------------

 
     bool       m_modalShowing;
 
     bool       m_modalShowing;

-    wxString   m_title;
-    wxIcon     m_icon;
-
-protected:
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);

 
 private:
 
 private:

-    DECLARE_EVENT_TABLE()
+    // common part of all ctors
+    void Init();
+    wxGUIEventLoop *m_modalLoop;
+    DECLARE_DYNAMIC_CLASS(wxDialog)

 };
 
 };
 

-#endif // __GTKDIALOGH__
+#endif // _WX_GTKDIALOG_H_