Linker fix for non-PM builds.

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

diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h
index 0c7ea69240d7b9c53fcde8de6d0f8b3d6bd81b05..b14cd1100717035ae10cc876ec67386caf1be868 100644 (file)
--- a/include/wx/gtk/dialog.h
+++ b/include/wx/gtk/dialog.h
@@ -11,96 +11,44 @@
 #ifndef __GTKDIALOGH__
 #define __GTKDIALOGH__
 
 #ifndef __GTKDIALOGH__
 #define __GTKDIALOGH__
 

-#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;
-

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

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

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxDialog)
-

 public:
 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 );
             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 );
+    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 );
+    virtual ~wxDialog();

 
 

-  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() { }
+    virtual bool Show( bool show = TRUE );
+    virtual int ShowModal();
+    virtual void EndModal( int retCode );
+    virtual bool IsModal() const;
+    void SetModal( bool modal );

 
 

-// 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;
+private:
+    // common part of all ctors
+    void Init();

 
 

-  DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxDialog)

 };
 
 #endif // __GTKDIALOGH__
 };
 
 #endif // __GTKDIALOGH__