adding scroll wheel support

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

diff --git a/include/wx/gtk1/dialog.h b/include/wx/gtk1/dialog.h
index 25cfa99c37751f0ca1affd972d66ec0574352129..fb78c8c440323c5fa57dbe2c2bcef9c8bf3fe1f9 100644 (file)
--- a/include/wx/gtk1/dialog.h
+++ b/include/wx/gtk1/dialog.h
@@ -1,106 +1,65 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Created:
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Created:
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:           wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #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
+// wxDialog

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-class wxDialog;
+class WXDLLIMPEXP_CORE wxDialog: public wxDialogBase
+{
+public:
+    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 );
+    virtual ~wxDialog() {}

 
 

-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
+    void OnApply( wxCommandEvent &event );
+    void OnCancel( wxCommandEvent &event );
+    void OnOK( wxCommandEvent &event );
+    void OnPaint( wxPaintEvent& event );
+    void OnCloseWindow( wxCloseEvent& event );
+    /*
+       void OnCharHook( wxKeyEvent& event );
+     */

 
 

-extern const char *wxDialogNameStr;
+    virtual bool Show( bool show = TRUE );
+    virtual int ShowModal();
+    virtual void EndModal( int retCode );
+    virtual bool IsModal() const;
+    void SetModal( bool modal );

 
 

-//-----------------------------------------------------------------------------
-// wxDialog
-//-----------------------------------------------------------------------------
+    // implementation
+    // --------------

 
 

-class wxDialog: public wxPanel
-{
-  DECLARE_DYNAMIC_CLASS(wxDialog)
+    bool       m_modalShowing;

 
 

-public:
-  wxDialog();
-  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 );
-  ~wxDialog();
-  
-  void SetTitle(const wxString& title);
-  wxString GetTitle() const;
-  
-  bool OnClose();
-  void OnApply( wxCommandEvent &event );
-  void OnCancel( wxCommandEvent &event );
-  void OnOK( wxCommandEvent &event );
-  void OnPaint( wxPaintEvent& event );
-  void OnSize( wxSizeEvent &event );
-/*
-  void OnCharHook( wxKeyEvent& event );
-*/
-  
-  bool Destroy();
-  void OnCloseWindow( wxCloseEvent& event );
-  
-  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 );
-  
-  bool       m_modalShowing;
-  wxString   m_title;
-  wxIcon     m_icon;
-    
-  DECLARE_EVENT_TABLE()
+protected:
+    // common part of all ctors
+    void Init();
+
+private:
+    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxDialog)

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