wxWindow::OnClose() removed completely from wxGTK, wxCloseEvent is now

processed properly. Also, fixes for compilation without WXWIN_COMPATIBILITY
on.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/docview.h

@@ -187,8 +187,11 @@ class WXDLLEXPORT wxView: public wxEvtHandler
 
   // Override to do cleanup/veto close
   virtual bool OnClose(bool deleteWindow);
+
+#ifdef WXWIN_COMPATIBILITY
   // Defeat compiler warning
-  inline bool OnClose(void) { return wxEvtHandler::OnClose(); }
+  bool OnClose(void) { return wxEvtHandler::OnClose(); }
+#endif
 
   // Extend event processing to search the document's event table
   virtual bool ProcessEvent(wxEvent& event);
@@ -197,7 +200,8 @@ class WXDLLEXPORT wxView: public wxEvtHandler
   // The function then notifies the document manager.
   virtual void Activate(bool activate);
 
-  inline wxDocManager *GetDocumentManager(void) const { return m_viewDocument->GetDocumentManager(); }
+  wxDocManager *GetDocumentManager(void) const
+    { return m_viewDocument->GetDocumentManager(); }
 
 #if wxUSE_PRINTING_ARCHITECTURE
   virtual wxPrintout *OnCreatePrintout(void);

include/wx/gtk/dialog.h

@@ -5,7 +5,7 @@
 // Created:
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKDIALOGH__
@@ -41,24 +41,23 @@ class wxDialog: public wxPanel
 
 public:
   wxDialog();
-  wxDialog( wxWindow *parent, wxWindowID id, 
+  wxDialog( wxWindow *parent, wxWindowID id,
             const wxString &title,
-            const wxPoint &pos = wxDefaultPosition, 
+            const wxPoint &pos = wxDefaultPosition,
-	    const wxSize &size = wxDefaultSize, 
+            const wxSize &size = wxDefaultSize,
-            long style = wxDEFAULT_DIALOG_STYLE, 
+            long style = wxDEFAULT_DIALOG_STYLE,
-	    const wxString &name = wxDialogNameStr );
+            const wxString &name = wxDialogNameStr );
-  bool Create( wxWindow *parent, wxWindowID id, 
+  bool Create( wxWindow *parent, wxWindowID id,
                const wxString &title,
-               const wxPoint &pos = wxDefaultPosition, 
+               const wxPoint &pos = wxDefaultPosition,
-	       const wxSize &size = wxDefaultSize, 
+               const wxSize &size = wxDefaultSize,
-               long style = wxDEFAULT_DIALOG_STYLE, 
+               long style = wxDEFAULT_DIALOG_STYLE,
-	       const wxString &name = wxDialogNameStr );
+               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 );
@@ -67,39 +66,39 @@ public:
 /*
   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()
 };
 

include/wx/gtk/minifram.h

@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKMINIFRAMEH__
@@ -28,41 +28,41 @@ class wxMiniFrame;
 // wxMiniFrame
 //-----------------------------------------------------------------------------
 
-class wxMiniFrame: public wxFrame 
+class wxMiniFrame: public wxFrame
 {
-  DECLARE_DYNAMIC_CLASS(wxMiniFrame)
+    DECLARE_DYNAMIC_CLASS(wxMiniFrame)
 
 public:
-  inline wxMiniFrame(void) {}
+    wxMiniFrame() {}
-  inline wxMiniFrame(wxWindow *parent,
+    wxMiniFrame(wxWindow *parent,
-           wxWindowID id,
+            wxWindowID id,
-           const wxString& title,
+            const wxString& title,
-           const wxPoint& pos = wxDefaultPosition,
+            const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
+            const wxSize& size = wxDefaultSize,
-           long style = wxDEFAULT_FRAME|wxTINY_CAPTION_HORIZ,
+            long style = wxDEFAULT_FRAME_STYLE | wxTINY_CAPTION_HORIZ,
-           const wxString& name = wxFrameNameStr)
+            const wxString& name = wxFrameNameStr)
-  {
+    {
-      Create(parent, id, title, pos, size, style, name);
+        Create(parent, id, title, pos, size, style, name);
-  }
+    }
-  bool Create(wxWindow *parent,
-           wxWindowID id,
-           const wxString& title,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxDEFAULT_FRAME|wxTINY_CAPTION_HORIZ,
-           const wxString& name = wxFrameNameStr);
-	   
-  // implementation	   
-	   
-  bool   m_isDragging;
-  int    m_oldX,m_oldY;
-  int    m_diffX,m_diffY;
-  
-  void DrawFrame( int x, int y );
-  void OnPaint( wxPaintEvent &event );
-  void OnMouse( wxMouseEvent &event );
 
-  DECLARE_EVENT_TABLE()
+    bool Create(wxWindow *parent,
+            wxWindowID id,
+            const wxString& title,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            long style = wxDEFAULT_FRAME_STYLE | wxTINY_CAPTION_HORIZ,
+            const wxString& name = wxFrameNameStr);
+
+    // implementation
+    bool   m_isDragging;
+    int    m_oldX,m_oldY;
+    int    m_diffX,m_diffY;
+
+    void DrawFrame( int x, int y );
+    void OnPaint( wxPaintEvent &event );
+    void OnMouse( wxMouseEvent &event );
+
+    DECLARE_EVENT_TABLE()
 };
 
 #endif

include/wx/gtk/window.h

@@ -184,7 +184,6 @@ public:
   virtual void MakeModal( bool modal );
   virtual bool IsEnabled() const { return m_isEnabled; }
   inline bool Enabled() const { return IsEnabled(); }
-  virtual bool OnClose();
 
   virtual void SetFocus();
   static wxWindow *FindFocus();
@@ -195,6 +194,7 @@ public:
   virtual void RemoveChild( wxWindow *child );
   void SetReturnCode( int retCode );
   int GetReturnCode();
+
   wxWindow *GetParent() const
     { return m_parent; }
   wxWindow *GetGrandParent() const
@@ -260,10 +260,10 @@ public:
   virtual wxFont& GetFont() { return m_font; }
 
     // For backward compatibility
-  inline virtual void SetButtonFont(const wxFont& font) { SetFont(font); }
+  virtual void SetButtonFont(const wxFont& font) { SetFont(font); }
-  inline virtual void SetLabelFont(const wxFont& font) { SetFont(font); }
+  virtual void SetLabelFont(const wxFont& font) { SetFont(font); }
-  inline virtual wxFont& GetLabelFont() { return GetFont(); };
+  virtual wxFont& GetLabelFont() { return GetFont(); };
-  inline virtual wxFont& GetButtonFont() { return GetFont(); };
+  virtual wxFont& GetButtonFont() { return GetFont(); };
 
   virtual void SetWindowStyleFlag( long flag );
   virtual long GetWindowStyleFlag() const;
@@ -277,7 +277,7 @@ public:
   virtual wxString GetName() const;
   virtual wxString GetLabel() const;
 
-  void OnSysColourChanged( wxSysColourChangedEvent &WXUNUSED(event) ) {};
+  void OnSysColourChanged( wxSysColourChangedEvent &WXUNUSED(event) ) { }
   void OnKeyDown( wxKeyEvent &event );
 
   virtual bool IsShown() const;
@@ -289,8 +289,8 @@ public:
   virtual wxWindow *FindWindow( long id );
   virtual wxWindow *FindWindow( const wxString& name );
 
-  void AllowDoubleClick( bool WXUNUSED(allow) ) {};
+  void AllowDoubleClick( bool WXUNUSED(allow) ) { }
-  void SetDoubleClick( bool WXUNUSED(allow) ) {};
+  void SetDoubleClick( bool WXUNUSED(allow) ) { }
 
   virtual void ClientToScreen( int *x, int *y );
   virtual void ScreenToClient( int *x, int *y );

include/wx/gtk1/dialog.h

@@ -5,7 +5,7 @@
 // Created:
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKDIALOGH__
@@ -41,24 +41,23 @@ class wxDialog: public wxPanel
 
 public:
   wxDialog();
-  wxDialog( wxWindow *parent, wxWindowID id, 
+  wxDialog( wxWindow *parent, wxWindowID id,
             const wxString &title,
-            const wxPoint &pos = wxDefaultPosition, 
+            const wxPoint &pos = wxDefaultPosition,
-	    const wxSize &size = wxDefaultSize, 
+            const wxSize &size = wxDefaultSize,
-            long style = wxDEFAULT_DIALOG_STYLE, 
+            long style = wxDEFAULT_DIALOG_STYLE,
-	    const wxString &name = wxDialogNameStr );
+            const wxString &name = wxDialogNameStr );
-  bool Create( wxWindow *parent, wxWindowID id, 
+  bool Create( wxWindow *parent, wxWindowID id,
                const wxString &title,
-               const wxPoint &pos = wxDefaultPosition, 
+               const wxPoint &pos = wxDefaultPosition,
-	       const wxSize &size = wxDefaultSize, 
+               const wxSize &size = wxDefaultSize,
-               long style = wxDEFAULT_DIALOG_STYLE, 
+               long style = wxDEFAULT_DIALOG_STYLE,
-	       const wxString &name = wxDialogNameStr );
+               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 );
@@ -67,39 +66,39 @@ public:
 /*
   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()
 };
 

include/wx/gtk1/minifram.h

@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKMINIFRAMEH__
@@ -28,41 +28,41 @@ class wxMiniFrame;
 // wxMiniFrame
 //-----------------------------------------------------------------------------
 
-class wxMiniFrame: public wxFrame 
+class wxMiniFrame: public wxFrame
 {
-  DECLARE_DYNAMIC_CLASS(wxMiniFrame)
+    DECLARE_DYNAMIC_CLASS(wxMiniFrame)
 
 public:
-  inline wxMiniFrame(void) {}
+    wxMiniFrame() {}
-  inline wxMiniFrame(wxWindow *parent,
+    wxMiniFrame(wxWindow *parent,
-           wxWindowID id,
+            wxWindowID id,
-           const wxString& title,
+            const wxString& title,
-           const wxPoint& pos = wxDefaultPosition,
+            const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
+            const wxSize& size = wxDefaultSize,
-           long style = wxDEFAULT_FRAME|wxTINY_CAPTION_HORIZ,
+            long style = wxDEFAULT_FRAME_STYLE | wxTINY_CAPTION_HORIZ,
-           const wxString& name = wxFrameNameStr)
+            const wxString& name = wxFrameNameStr)
-  {
+    {
-      Create(parent, id, title, pos, size, style, name);
+        Create(parent, id, title, pos, size, style, name);
-  }
+    }
-  bool Create(wxWindow *parent,
-           wxWindowID id,
-           const wxString& title,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxDEFAULT_FRAME|wxTINY_CAPTION_HORIZ,
-           const wxString& name = wxFrameNameStr);
-	   
-  // implementation	   
-	   
-  bool   m_isDragging;
-  int    m_oldX,m_oldY;
-  int    m_diffX,m_diffY;
-  
-  void DrawFrame( int x, int y );
-  void OnPaint( wxPaintEvent &event );
-  void OnMouse( wxMouseEvent &event );
 
-  DECLARE_EVENT_TABLE()
+    bool Create(wxWindow *parent,
+            wxWindowID id,
+            const wxString& title,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            long style = wxDEFAULT_FRAME_STYLE | wxTINY_CAPTION_HORIZ,
+            const wxString& name = wxFrameNameStr);
+
+    // implementation
+    bool   m_isDragging;
+    int    m_oldX,m_oldY;
+    int    m_diffX,m_diffY;
+
+    void DrawFrame( int x, int y );
+    void OnPaint( wxPaintEvent &event );
+    void OnMouse( wxMouseEvent &event );
+
+    DECLARE_EVENT_TABLE()
 };
 
 #endif

include/wx/gtk1/window.h

@@ -184,7 +184,6 @@ public:
   virtual void MakeModal( bool modal );
   virtual bool IsEnabled() const { return m_isEnabled; }
   inline bool Enabled() const { return IsEnabled(); }
-  virtual bool OnClose();
 
   virtual void SetFocus();
   static wxWindow *FindFocus();
@@ -195,6 +194,7 @@ public:
   virtual void RemoveChild( wxWindow *child );
   void SetReturnCode( int retCode );
   int GetReturnCode();
+
   wxWindow *GetParent() const
     { return m_parent; }
   wxWindow *GetGrandParent() const
@@ -260,10 +260,10 @@ public:
   virtual wxFont& GetFont() { return m_font; }
 
     // For backward compatibility
-  inline virtual void SetButtonFont(const wxFont& font) { SetFont(font); }
+  virtual void SetButtonFont(const wxFont& font) { SetFont(font); }
-  inline virtual void SetLabelFont(const wxFont& font) { SetFont(font); }
+  virtual void SetLabelFont(const wxFont& font) { SetFont(font); }
-  inline virtual wxFont& GetLabelFont() { return GetFont(); };
+  virtual wxFont& GetLabelFont() { return GetFont(); };
-  inline virtual wxFont& GetButtonFont() { return GetFont(); };
+  virtual wxFont& GetButtonFont() { return GetFont(); };
 
   virtual void SetWindowStyleFlag( long flag );
   virtual long GetWindowStyleFlag() const;
@@ -277,7 +277,7 @@ public:
   virtual wxString GetName() const;
   virtual wxString GetLabel() const;
 
-  void OnSysColourChanged( wxSysColourChangedEvent &WXUNUSED(event) ) {};
+  void OnSysColourChanged( wxSysColourChangedEvent &WXUNUSED(event) ) { }
   void OnKeyDown( wxKeyEvent &event );
 
   virtual bool IsShown() const;
@@ -289,8 +289,8 @@ public:
   virtual wxWindow *FindWindow( long id );
   virtual wxWindow *FindWindow( const wxString& name );
 
-  void AllowDoubleClick( bool WXUNUSED(allow) ) {};
+  void AllowDoubleClick( bool WXUNUSED(allow) ) { }
-  void SetDoubleClick( bool WXUNUSED(allow) ) {};
+  void SetDoubleClick( bool WXUNUSED(allow) ) { }
 
   virtual void ClientToScreen( int *x, int *y );
   virtual void ScreenToClient( int *x, int *y );

src/gtk/dialog.cpp

@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -28,14 +28,14 @@ extern wxList wxPendingDelete;
 //-----------------------------------------------------------------------------
 
 bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
-{ 
+{
 /*
     printf( "OnDelete from " );
     if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
         printf( win->GetClassInfo()->GetClassName() );
     printf( ".\n" );
 */
-  
+
     win->Close();
 
     return TRUE;
@@ -97,9 +97,9 @@ wxDialog::wxDialog()
     m_modalShowing = FALSE;
 }
 
-wxDialog::wxDialog( wxWindow *parent, 
+wxDialog::wxDialog( wxWindow *parent,
                     wxWindowID id, const wxString &title,
-                    const wxPoint &pos, const wxSize &size, 
+                    const wxPoint &pos, const wxSize &size,
                     long style, const wxString &name )
 {
     m_modalShowing = FALSE;
@@ -108,60 +108,60 @@ wxDialog::wxDialog( wxWindow *parent,
 
 bool wxDialog::Create( wxWindow *parent,
                        wxWindowID id, const wxString &title,
-                       const wxPoint &pos, const wxSize &size, 
+                       const wxPoint &pos, const wxSize &size,
                        long style, const wxString &name )
 {
     wxTopLevelWindows.Append( this );
-    
+
     m_needParent = FALSE;
-  
+
     PreCreation( parent, id, pos, size, style, name );
-  
+
     m_widget = gtk_window_new( GTK_WINDOW_TOPLEVEL );
     GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
- 
+
     gtk_widget_set( m_widget, "GtkWindow::allow_shrink", TRUE, NULL);
-  
+
-    gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event", 
+    gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
         GTK_SIGNAL_FUNC(gtk_dialog_delete_callback), (gpointer)this );
-    
+
     m_wxwindow = gtk_myfixed_new();
     gtk_widget_show( m_wxwindow );
     GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
-  
+
     gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );
-  
+
     SetTitle( title );
-  
+
     if ((m_x != -1) || (m_y != -1))
         gtk_widget_set_uposition( m_widget, m_x, m_y );
-     
+
     gtk_widget_set_usize( m_widget, m_width, m_height );
-     
+
-    gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate", 
+    gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
         GTK_SIGNAL_FUNC(gtk_dialog_size_callback), (gpointer)this );
-    
+
     gtk_signal_connect( GTK_OBJECT(m_widget), "configure_event",
         GTK_SIGNAL_FUNC(gtk_dialog_configure_callback), (gpointer)this );
 
     if (m_parent) m_parent->AddChild( this );
-  
+
     PostCreation();
-  
+
     return TRUE;
 }
 
 wxDialog::~wxDialog()
 {
     wxTopLevelWindows.DeleteObject( this );
-    
+
     if (wxTheApp->GetTopWindow() == this)
     {
         wxTheApp->SetTopWindow( (wxWindow*) NULL );
     }
-    
+
     if (wxTopLevelWindows.Number() == 0)
-    {  
+    {
         wxTheApp->ExitMainLoop();
     }
 }
@@ -200,7 +200,7 @@ void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) )
 {
     if ( Validate() && TransferDataFromWindow())
     {
-        if (IsModal()) 
+        if (IsModal())
         {
             EndModal(wxID_OK);
         }
@@ -214,23 +214,25 @@ void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) )
 
 void wxDialog::OnPaint( wxPaintEvent& WXUNUSED(event) )
 {
-  // yes
+    // yes
 }
 
-bool wxDialog::OnClose()
+void wxDialog::OnCloseWindow(wxCloseEvent& event)
 {
     static wxList closing;
 
-    if (closing.Member(this)) return FALSE;   // no loops
+    if (closing.Member(this))
-  
+        return;   // no loops
+
     closing.Append(this);
 
     wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
     cancelEvent.SetEventObject( this );
     GetEventHandler()->ProcessEvent(cancelEvent);
     closing.DeleteObject(this);
-  
+
-    return FALSE;
+    if ( event.CanVeto() )
+        event.Veto();
 }
 
 bool wxDialog::Destroy()
@@ -240,14 +242,6 @@ bool wxDialog::Destroy()
     return TRUE;
 }
 
-void wxDialog::OnCloseWindow( wxCloseEvent& event )
-{
-    if (GetEventHandler()->OnClose() || event.GetForce())
-    {
-        this->Destroy();
-    }
-}
-
 void wxDialog::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )
 {
     // due to a bug in gtk, x,y are always 0
@@ -257,10 +251,10 @@ void wxDialog::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int heigh
     if ((m_height == height) && (m_width == width) &&
         (m_sizeSet)) return;
     if (!m_wxwindow) return;
-  
+
     m_width = width;
     m_height = height;
-  
+
     if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth;
     if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight;
     if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth;
@@ -269,7 +263,7 @@ void wxDialog::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int heigh
     gtk_widget_set_usize( m_widget, m_width, m_height );
 
     m_sizeSet = TRUE;
-    
+
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
     event.SetEventObject( this );
     GetEventHandler()->ProcessEvent( event );
@@ -278,16 +272,16 @@ void wxDialog::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int heigh
 void wxDialog::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
     wxASSERT_MSG( (m_widget != NULL), "invalid dialog" );
-  
+
     if (GetAutoLayout())
     {
         Layout();
     }
-    else 
+    else
     {
         // no child: go out !
         if (!GetChildren().First()) return;
-      
+
         // do we have exactly one child?
         wxWindow *child = (wxWindow *) NULL;
         for(wxNode *node = GetChildren().First(); node; node = node->Next())
@@ -295,7 +289,7 @@ void wxDialog::OnSize( wxSizeEvent &WXUNUSED(event) )
             wxWindow *win = (wxWindow *)node->Data();
             if (!wxIS_KIND_OF(win,wxFrame) && !wxIS_KIND_OF(win,wxDialog))
             {
-	        // it's the second one: do nothing
+                // it's the second one: do nothing
                 if (child) return;
                 child = win;
             }
@@ -311,7 +305,7 @@ void wxDialog::OnSize( wxSizeEvent &WXUNUSED(event) )
 void wxDialog::SetSize( int x, int y, int width, int height, int sizeFlags )
 {
     wxASSERT_MSG( (m_widget != NULL), "invalid window" );
-  
+
     // Don't do anything for children of wxMDIChildFrame
     if (!m_wxwindow) return;
 
@@ -322,7 +316,7 @@ void wxDialog::SetSize( int x, int y, int width, int height, int sizeFlags )
     int old_y = m_y;
     int old_width = m_width;
     int old_height = m_height;
-  
+
     if ((sizeFlags & wxSIZE_USE_EXISTING) == wxSIZE_USE_EXISTING)
     {
         if (x != -1) m_x = x;
@@ -347,7 +341,7 @@ void wxDialog::SetSize( int x, int y, int width, int height, int sizeFlags )
     {
        if (height == -1) m_height = 26;
     }
-  
+
     if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth;
     if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight;
     if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth;
@@ -355,15 +349,15 @@ void wxDialog::SetSize( int x, int y, int width, int height, int sizeFlags )
 
     if ((m_x != -1) || (m_y != -1))
     {
-        if ((m_x != old_x) || (m_y != old_y)) 
+        if ((m_x != old_x) || (m_y != old_y))
             gtk_widget_set_uposition( m_widget, m_x, m_y );
     }
-  
+
     if ((m_width != old_width) || (m_height != old_height))
     {
         gtk_widget_set_usize( m_widget, m_width, m_height );
     }
-  
+
     m_sizeSet = TRUE;
 
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
@@ -381,13 +375,13 @@ void wxDialog::SetSize( int width, int height )
 void wxDialog::Centre( int direction )
 {
     wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-  
+
     int x = 0;
     int y = 0;
-    
+
     if (direction & wxHORIZONTAL == wxHORIZONTAL) x = (gdk_screen_width () - m_width) / 2;
     if (direction & wxVERTICAL == wxVERTICAL) y = (gdk_screen_height () - m_height) / 2;
-  
+
     Move( x, y );
 }
 
@@ -399,9 +393,9 @@ bool wxDialog::Show( bool show )
     }
 
     wxWindow::Show( show );
-  
+
     if (show) InitDialog();
-  
+
     return TRUE;
 }
 
@@ -430,30 +424,30 @@ int wxDialog::ShowModal()
     }
 
     Show( TRUE );
-  
+
     m_modalShowing = TRUE;
-  
+
     gtk_grab_add( m_widget );
     gtk_main();
     gtk_grab_remove( m_widget );
-  
+
     return GetReturnCode();
 }
 
 void wxDialog::EndModal( int retCode )
 {
     SetReturnCode( retCode );
-  
+
     if (!IsModal())
     {
         wxFAIL_MSG( "wxDialog:EndModal called twice" );
         return;
     }
-  
+
     m_modalShowing = FALSE;
-  
+
     gtk_main_quit();
-  
+
     Show( FALSE );
 }
 
@@ -466,10 +460,10 @@ void wxDialog::SetIcon( const wxIcon &icon )
 {
     m_icon = icon;
     if (!icon.Ok()) return;
-  
+
     wxMask *mask = icon.GetMask();
     GdkBitmap *bm = (GdkBitmap *) NULL;
     if (mask) bm = mask->GetBitmap();
-  
+
     gdk_window_set_icon( m_widget->window, (GdkWindow *) NULL, icon.GetPixmap(), bm );
 }

src/gtk/frame.cpp

@@ -104,7 +104,6 @@ static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventC
 
 BEGIN_EVENT_TABLE(wxFrame, wxWindow)
     EVT_SIZE(wxFrame::OnSize)
-    EVT_CLOSE(wxFrame::OnCloseWindow)
     EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)
 END_EVENT_TABLE()
 
@@ -197,14 +196,14 @@ wxFrame::~wxFrame()
     if (m_frameToolBar) delete m_frameToolBar;
 
     wxTopLevelWindows.DeleteObject( this );
-    
+
     if (wxTheApp->GetTopWindow() == this)
     {
         wxTheApp->SetTopWindow( (wxWindow*) NULL );
     }
-    
+
     if (wxTopLevelWindows.Number() == 0)
-    {  
+    {
         wxTheApp->ExitMainLoop();
     }
 }
@@ -226,11 +225,6 @@ bool wxFrame::Show( bool show )
     return wxWindow::Show( show );
 }
 
-void wxFrame::OnCloseWindow( wxCloseEvent &event )
-{
-    if (GetEventHandler()->OnClose() || event.GetForce()) this->Destroy();
-}
-
 bool wxFrame::Destroy()
 {
     wxASSERT_MSG( (m_widget != NULL), "invalid frame" );

src/gtk/window.cpp

@@ -1716,9 +1716,15 @@ bool wxWindow::Close( bool force )
 
     wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId);
     event.SetEventObject(this);
-    event.SetForce(force);
+    event.SetCanVeto(!force);
 
-    return GetEventHandler()->ProcessEvent(event);
+    (void)GetEventHandler()->ProcessEvent(event);
+
+    // when we're forced to close we do it anyhow, otherwise only if the
+    // application didn't forbid it (if the event wasn't processed, GetVeto()
+    // will return FALSE too)
+    if ( force || !event.GetVeto() )
+        Destroy();
 }
 
 bool wxWindow::Destroy()
@@ -2235,11 +2241,6 @@ bool wxWindow::AcceptsFocus() const
     return IsEnabled() && IsShown() && m_acceptsFocus;
 }
 
-bool wxWindow::OnClose()
-{
-    return TRUE;
-}
-
 void wxWindow::AddChild( wxWindow *child )
 {
     wxCHECK_RET( (m_widget != NULL), "invalid window" );

src/gtk1/dialog.cpp

@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -28,14 +28,14 @@ extern wxList wxPendingDelete;
 //-----------------------------------------------------------------------------
 
 bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
-{ 
+{
 /*
     printf( "OnDelete from " );
     if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
         printf( win->GetClassInfo()->GetClassName() );
     printf( ".\n" );
 */
-  
+
     win->Close();
 
     return TRUE;
@@ -97,9 +97,9 @@ wxDialog::wxDialog()
     m_modalShowing = FALSE;
 }
 
-wxDialog::wxDialog( wxWindow *parent, 
+wxDialog::wxDialog( wxWindow *parent,
                     wxWindowID id, const wxString &title,
-                    const wxPoint &pos, const wxSize &size, 
+                    const wxPoint &pos, const wxSize &size,
                     long style, const wxString &name )
 {
     m_modalShowing = FALSE;
@@ -108,60 +108,60 @@ wxDialog::wxDialog( wxWindow *parent,
 
 bool wxDialog::Create( wxWindow *parent,
                        wxWindowID id, const wxString &title,
-                       const wxPoint &pos, const wxSize &size, 
+                       const wxPoint &pos, const wxSize &size,
                        long style, const wxString &name )
 {
     wxTopLevelWindows.Append( this );
-    
+
     m_needParent = FALSE;
-  
+
     PreCreation( parent, id, pos, size, style, name );
-  
+
     m_widget = gtk_window_new( GTK_WINDOW_TOPLEVEL );
     GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
- 
+
     gtk_widget_set( m_widget, "GtkWindow::allow_shrink", TRUE, NULL);
-  
+
-    gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event", 
+    gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
         GTK_SIGNAL_FUNC(gtk_dialog_delete_callback), (gpointer)this );
-    
+
     m_wxwindow = gtk_myfixed_new();
     gtk_widget_show( m_wxwindow );
     GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
-  
+
     gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );
-  
+
     SetTitle( title );
-  
+
     if ((m_x != -1) || (m_y != -1))
         gtk_widget_set_uposition( m_widget, m_x, m_y );
-     
+
     gtk_widget_set_usize( m_widget, m_width, m_height );
-     
+
-    gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate", 
+    gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
         GTK_SIGNAL_FUNC(gtk_dialog_size_callback), (gpointer)this );
-    
+
     gtk_signal_connect( GTK_OBJECT(m_widget), "configure_event",
         GTK_SIGNAL_FUNC(gtk_dialog_configure_callback), (gpointer)this );
 
     if (m_parent) m_parent->AddChild( this );
-  
+
     PostCreation();
-  
+
     return TRUE;
 }
 
 wxDialog::~wxDialog()
 {
     wxTopLevelWindows.DeleteObject( this );
-    
+
     if (wxTheApp->GetTopWindow() == this)
     {
         wxTheApp->SetTopWindow( (wxWindow*) NULL );
     }
-    
+
     if (wxTopLevelWindows.Number() == 0)
-    {  
+    {
         wxTheApp->ExitMainLoop();
     }
 }
@@ -200,7 +200,7 @@ void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) )
 {
     if ( Validate() && TransferDataFromWindow())
     {
-        if (IsModal()) 
+        if (IsModal())
         {
             EndModal(wxID_OK);
         }
@@ -214,23 +214,25 @@ void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) )
 
 void wxDialog::OnPaint( wxPaintEvent& WXUNUSED(event) )
 {
-  // yes
+    // yes
 }
 
-bool wxDialog::OnClose()
+void wxDialog::OnCloseWindow(wxCloseEvent& event)
 {
     static wxList closing;
 
-    if (closing.Member(this)) return FALSE;   // no loops
+    if (closing.Member(this))
-  
+        return;   // no loops
+
     closing.Append(this);
 
     wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
     cancelEvent.SetEventObject( this );
     GetEventHandler()->ProcessEvent(cancelEvent);
     closing.DeleteObject(this);
-  
+
-    return FALSE;
+    if ( event.CanVeto() )
+        event.Veto();
 }
 
 bool wxDialog::Destroy()
@@ -240,14 +242,6 @@ bool wxDialog::Destroy()
     return TRUE;
 }
 
-void wxDialog::OnCloseWindow( wxCloseEvent& event )
-{
-    if (GetEventHandler()->OnClose() || event.GetForce())
-    {
-        this->Destroy();
-    }
-}
-
 void wxDialog::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )
 {
     // due to a bug in gtk, x,y are always 0
@@ -257,10 +251,10 @@ void wxDialog::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int heigh
     if ((m_height == height) && (m_width == width) &&
         (m_sizeSet)) return;
     if (!m_wxwindow) return;
-  
+
     m_width = width;
     m_height = height;
-  
+
     if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth;
     if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight;
     if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth;
@@ -269,7 +263,7 @@ void wxDialog::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int heigh
     gtk_widget_set_usize( m_widget, m_width, m_height );
 
     m_sizeSet = TRUE;
-    
+
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
     event.SetEventObject( this );
     GetEventHandler()->ProcessEvent( event );
@@ -278,16 +272,16 @@ void wxDialog::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int heigh
 void wxDialog::OnSize( wxSizeEvent &WXUNUSED(event) )
 {
     wxASSERT_MSG( (m_widget != NULL), "invalid dialog" );
-  
+
     if (GetAutoLayout())
     {
         Layout();
     }
-    else 
+    else
     {
         // no child: go out !
         if (!GetChildren().First()) return;
-      
+
         // do we have exactly one child?
         wxWindow *child = (wxWindow *) NULL;
         for(wxNode *node = GetChildren().First(); node; node = node->Next())
@@ -295,7 +289,7 @@ void wxDialog::OnSize( wxSizeEvent &WXUNUSED(event) )
             wxWindow *win = (wxWindow *)node->Data();
             if (!wxIS_KIND_OF(win,wxFrame) && !wxIS_KIND_OF(win,wxDialog))
             {
-	        // it's the second one: do nothing
+                // it's the second one: do nothing
                 if (child) return;
                 child = win;
             }
@@ -311,7 +305,7 @@ void wxDialog::OnSize( wxSizeEvent &WXUNUSED(event) )
 void wxDialog::SetSize( int x, int y, int width, int height, int sizeFlags )
 {
     wxASSERT_MSG( (m_widget != NULL), "invalid window" );
-  
+
     // Don't do anything for children of wxMDIChildFrame
     if (!m_wxwindow) return;
 
@@ -322,7 +316,7 @@ void wxDialog::SetSize( int x, int y, int width, int height, int sizeFlags )
     int old_y = m_y;
     int old_width = m_width;
     int old_height = m_height;
-  
+
     if ((sizeFlags & wxSIZE_USE_EXISTING) == wxSIZE_USE_EXISTING)
     {
         if (x != -1) m_x = x;
@@ -347,7 +341,7 @@ void wxDialog::SetSize( int x, int y, int width, int height, int sizeFlags )
     {
        if (height == -1) m_height = 26;
     }
-  
+
     if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth;
     if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight;
     if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth;
@@ -355,15 +349,15 @@ void wxDialog::SetSize( int x, int y, int width, int height, int sizeFlags )
 
     if ((m_x != -1) || (m_y != -1))
     {
-        if ((m_x != old_x) || (m_y != old_y)) 
+        if ((m_x != old_x) || (m_y != old_y))
             gtk_widget_set_uposition( m_widget, m_x, m_y );
     }
-  
+
     if ((m_width != old_width) || (m_height != old_height))
     {
         gtk_widget_set_usize( m_widget, m_width, m_height );
     }
-  
+
     m_sizeSet = TRUE;
 
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
@@ -381,13 +375,13 @@ void wxDialog::SetSize( int width, int height )
 void wxDialog::Centre( int direction )
 {
     wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
-  
+
     int x = 0;
     int y = 0;
-    
+
     if (direction & wxHORIZONTAL == wxHORIZONTAL) x = (gdk_screen_width () - m_width) / 2;
     if (direction & wxVERTICAL == wxVERTICAL) y = (gdk_screen_height () - m_height) / 2;
-  
+
     Move( x, y );
 }
 
@@ -399,9 +393,9 @@ bool wxDialog::Show( bool show )
     }
 
     wxWindow::Show( show );
-  
+
     if (show) InitDialog();
-  
+
     return TRUE;
 }
 
@@ -430,30 +424,30 @@ int wxDialog::ShowModal()
     }
 
     Show( TRUE );
-  
+
     m_modalShowing = TRUE;
-  
+
     gtk_grab_add( m_widget );
     gtk_main();
     gtk_grab_remove( m_widget );
-  
+
     return GetReturnCode();
 }
 
 void wxDialog::EndModal( int retCode )
 {
     SetReturnCode( retCode );
-  
+
     if (!IsModal())
     {
         wxFAIL_MSG( "wxDialog:EndModal called twice" );
         return;
     }
-  
+
     m_modalShowing = FALSE;
-  
+
     gtk_main_quit();
-  
+
     Show( FALSE );
 }
 
@@ -466,10 +460,10 @@ void wxDialog::SetIcon( const wxIcon &icon )
 {
     m_icon = icon;
     if (!icon.Ok()) return;
-  
+
     wxMask *mask = icon.GetMask();
     GdkBitmap *bm = (GdkBitmap *) NULL;
     if (mask) bm = mask->GetBitmap();
-  
+
     gdk_window_set_icon( m_widget->window, (GdkWindow *) NULL, icon.GetPixmap(), bm );
 }

src/gtk1/frame.cpp

@@ -104,7 +104,6 @@ static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventC
 
 BEGIN_EVENT_TABLE(wxFrame, wxWindow)
     EVT_SIZE(wxFrame::OnSize)
-    EVT_CLOSE(wxFrame::OnCloseWindow)
     EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)
 END_EVENT_TABLE()
 
@@ -197,14 +196,14 @@ wxFrame::~wxFrame()
     if (m_frameToolBar) delete m_frameToolBar;
 
     wxTopLevelWindows.DeleteObject( this );
-    
+
     if (wxTheApp->GetTopWindow() == this)
     {
         wxTheApp->SetTopWindow( (wxWindow*) NULL );
     }
-    
+
     if (wxTopLevelWindows.Number() == 0)
-    {  
+    {
         wxTheApp->ExitMainLoop();
     }
 }
@@ -226,11 +225,6 @@ bool wxFrame::Show( bool show )
     return wxWindow::Show( show );
 }
 
-void wxFrame::OnCloseWindow( wxCloseEvent &event )
-{
-    if (GetEventHandler()->OnClose() || event.GetForce()) this->Destroy();
-}
-
 bool wxFrame::Destroy()
 {
     wxASSERT_MSG( (m_widget != NULL), "invalid frame" );

src/gtk1/window.cpp

@@ -1716,9 +1716,15 @@ bool wxWindow::Close( bool force )
 
     wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId);
     event.SetEventObject(this);
-    event.SetForce(force);
+    event.SetCanVeto(!force);
 
-    return GetEventHandler()->ProcessEvent(event);
+    (void)GetEventHandler()->ProcessEvent(event);
+
+    // when we're forced to close we do it anyhow, otherwise only if the
+    // application didn't forbid it (if the event wasn't processed, GetVeto()
+    // will return FALSE too)
+    if ( force || !event.GetVeto() )
+        Destroy();
 }
 
 bool wxWindow::Destroy()
@@ -2235,11 +2241,6 @@ bool wxWindow::AcceptsFocus() const
     return IsEnabled() && IsShown() && m_acceptsFocus;
 }
 
-bool wxWindow::OnClose()
-{
-    return TRUE;
-}
-
 void wxWindow::AddChild( wxWindow *child )
 {
     wxCHECK_RET( (m_widget != NULL), "invalid window" );