more reasonable default size

[wxWidgets.git] / src / qt / window.cpp

diff --git a/src/qt/window.cpp b/src/qt/window.cpp
index 603f29994f259eab54b48c1c37728f0959816188..dce26c84da3b919aef81d4d1b84bb874d4ff2a0a 100644 (file)
--- a/src/qt/window.cpp
+++ b/src/qt/window.cpp
@@ -370,7 +370,7 @@ void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
     // TODO
 }
 
-void wxWindow::Refresh(bool eraseBack, const wxRectangle *rect)
+void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
 {
     // TODO
 }
@@ -534,7 +534,7 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
 }
 
 // Does a physical scroll
-void wxWindow::ScrollWindow(int dx, int dy, const wxRectangle *rect)
+void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
 {
     // TODO
     return 0;
@@ -1113,7 +1113,10 @@ bool wxWindow::Close(bool force)
 {
   wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId);
   event.SetEventObject(this);
+#if WXWIN_COMPATIBILITY
   event.SetForce(force);
+#endif
+  event.SetCanVeto(!force);
 
   return GetEventHandler()->ProcessEvent(event);
 }