fixed virtual function hiding for LoadBitmap()

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

diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h
index 002c3e1beddd9b8c4c1a63ae7505772e3e51001c..099dd51d74f371f10cc55f286748fcf17e1fe26d 100644 (file)
--- a/include/wx/gtk/dialog.h
+++ b/include/wx/gtk/dialog.h
@@ -11,36 +11,32 @@
 #ifndef __GTKDIALOGH__
 #define __GTKDIALOGH__
 
 #ifndef __GTKDIALOGH__
 #define __GTKDIALOGH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface
 #endif
 
 #include "wx/defs.h"
 #pragma interface
 #endif
 
 #include "wx/defs.h"

-#include "wx/panel.h"
-#include "wx/icon.h"

 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 

-class wxDialog;
+class WXDLLIMPEXP_CORE wxDialog;

 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 

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

 
 //-----------------------------------------------------------------------------
 // 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 +49,35 @@ 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;
+    ~wxDialog() {}

 
     void OnApply( wxCommandEvent &event );
     void OnCancel( wxCommandEvent &event );
     void OnOK( wxCommandEvent &event );
     void OnPaint( wxPaintEvent& event );
 
     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 );
      */
 
     void OnCloseWindow( wxCloseEvent& event );
     /*
        void OnCharHook( wxKeyEvent& event );
      */
 

-    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;
     void SetModal( bool modal );
 
     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:
 
 protected:

-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
+    // common part of all ctors
+    void Init();

 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()

+    DECLARE_DYNAMIC_CLASS(wxDialog)

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