custom icons for DnD

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

diff --git a/include/wx/gtk1/dialog.h b/include/wx/gtk1/dialog.h
index 25cfa99c37751f0ca1affd972d66ec0574352129..be05cebb0fbc9e4320a98e0dc39184de10d0d050 100644 (file)
--- a/include/wx/gtk1/dialog.h
+++ b/include/wx/gtk1/dialog.h
@@ -5,7 +5,7 @@
 // Created:
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Created:
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKDIALOGH__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKDIALOGH__


@@ -41,65 +41,64 @@ class wxDialog: public wxPanel
 
 public:
   wxDialog();
 
 public:
   wxDialog();

-  wxDialog( wxWindow *parent, wxWindowID id, 
+  wxDialog( wxWindow *parent, wxWindowID id,

             const wxString &title,
             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 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 wxString &title,

-               const wxPoint &pos = wxDefaultPosition, 
-              const wxSize &size = wxDefaultSize, 
-               long style = wxDEFAULT_DIALOG_STYLE, 
-              const wxString &name = wxDialogNameStr );
+               const wxPoint &pos = wxDefaultPosition,
+               const wxSize &size = wxDefaultSize,
+               long style = wxDEFAULT_DIALOG_STYLE,
+               const wxString &name = wxDialogNameStr );

   ~wxDialog();
   ~wxDialog();

-  
+

   void SetTitle(const wxString& title);
   wxString GetTitle() const;
   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 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 OnCharHook( wxKeyEvent& event );
 */

-  
+

   bool Destroy();
   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 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 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 InitDialog(void);

-    
+

   virtual void Centre( int direction = wxHORIZONTAL );
   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() { }
   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 GtkOnSize( int x, int y, int width, int height );

-  
+

   bool       m_modalShowing;
   wxString   m_title;
   wxIcon     m_icon;
   bool       m_modalShowing;
   wxString   m_title;
   wxIcon     m_icon;

-    
+

   DECLARE_EVENT_TABLE()
 };
 
   DECLARE_EVENT_TABLE()
 };