RPM version 2.3.0

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

diff --git a/src/qt/window.cpp b/src/qt/window.cpp
index 341ad00e51f48f6cd54fe5a6360230f026a71e30..761e34e9d077d7e00f6c01017924588b2ab74361 100644 (file)
--- a/src/qt/window.cpp
+++ b/src/qt/window.cpp
@@ -30,7 +30,7 @@
 #include "wx/menuitem.h"
 #include "wx/log.h"
 
 #include "wx/menuitem.h"
 #include "wx/log.h"
 

-#if  USE_DRAG_AND_DROP
+#if  wxUSE_DRAG_AND_DROP

 #include "wx/dnd.h"
 #endif
 
 #include "wx/dnd.h"
 #endif
 


@@ -38,7 +38,6 @@
 
 extern wxList wxPendingDelete;
 
 
 extern wxList wxPendingDelete;
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler)
 
 BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler)
 
 BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)


@@ -49,7 +48,6 @@ BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)
   EVT_IDLE(wxWindow::OnIdle)
 END_EVENT_TABLE()
 
   EVT_IDLE(wxWindow::OnIdle)
 END_EVENT_TABLE()
 

-#endif

 
 
 // Constructor
 
 
 // Constructor


@@ -79,7 +77,7 @@ wxWindow::wxWindow()
     m_defaultForegroundColour = *wxBLACK ;
     m_defaultBackgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE) ;
 
     m_defaultForegroundColour = *wxBLACK ;
     m_defaultBackgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE) ;
 

-#if  USE_DRAG_AND_DROP
+#if  wxUSE_DRAG_AND_DROP

     m_pDropTarget = NULL;
 #endif
 }
     m_pDropTarget = NULL;
 #endif
 }


@@ -90,7 +88,7 @@ wxWindow::~wxWindow()
        // Have to delete constraints/sizer FIRST otherwise
        // sizers may try to look at deleted windows as they
        // delete themselves.
        // Have to delete constraints/sizer FIRST otherwise
        // sizers may try to look at deleted windows as they
        // delete themselves.

-#if USE_CONSTRAINTS
+#if wxUSE_CONSTRAINTS

     DeleteRelatedConstraints();
     if (m_constraints)
     {
     DeleteRelatedConstraints();
     if (m_constraints)
     {


@@ -157,7 +155,7 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
     m_autoLayout = FALSE;
     m_windowValidator = NULL;
 
     m_autoLayout = FALSE;
     m_windowValidator = NULL;
 

-#if USE_DRAG_AND_DROP
+#if wxUSE_DRAG_AND_DROP

     m_pDropTarget = NULL;
 #endif
 
     m_pDropTarget = NULL;
 #endif
 


@@ -249,7 +247,7 @@ wxEvtHandler *wxWindow::PopEventHandler(bool deleteHandler)
                return NULL;
 }
 
                return NULL;
 }
 

-#if    USE_DRAG_AND_DROP
+#if    wxUSE_DRAG_AND_DROP

 
 void wxWindow::SetDropTarget(wxDropTarget *pDropTarget)
 {
 
 void wxWindow::SetDropTarget(wxDropTarget *pDropTarget)
 {


@@ -370,7 +368,7 @@ void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
     // TODO
 }
 
     // TODO
 }
 

-void wxWindow::Refresh(bool eraseBack, const wxRectangle *rect)
+void wxWindow::Refresh(bool eraseBack, const wxRect *rect)

 {
     // TODO
 }
 {
     // TODO
 }


@@ -534,7 +532,7 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
 }
 
 // Does a physical scroll
 }
 
 // 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;
 {
     // TODO
     return 0;


@@ -1113,7 +1111,10 @@ bool wxWindow::Close(bool force)
 {
   wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId);
   event.SetEventObject(this);
 {
   wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId);
   event.SetEventObject(this);

+#if WXWIN_COMPATIBILITY

   event.SetForce(force);
   event.SetForce(force);

+#endif
+  event.SetCanVeto(!force);

 
   return GetEventHandler()->ProcessEvent(event);
 }
 
   return GetEventHandler()->ProcessEvent(event);
 }