Oops, compile errors...

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

diff --git a/src/stubs/window.cpp b/src/stubs/window.cpp
index 8a4e50edb7f629147397208203e6cd149467ddee..0eeda07dfc5d81bbb1269641ed4d7ab655eae19c 100644 (file)
--- a/src/stubs/window.cpp
+++ b/src/stubs/window.cpp
@@ -39,7 +39,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)


@@ -52,13 +51,13 @@ BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)
   EVT_IDLE(wxWindow::OnIdle)
 END_EVENT_TABLE()
 
   EVT_IDLE(wxWindow::OnIdle)
 END_EVENT_TABLE()
 

-#endif

 
 
 // Constructor
 wxWindow::wxWindow()
 {
     // Generic
 
 
 // Constructor
 wxWindow::wxWindow()
 {
     // Generic

+    m_isWindow = TRUE; // An optimization

     m_windowId = 0;
     m_windowStyle = 0;
     m_windowParent = NULL;
     m_windowId = 0;
     m_windowStyle = 0;
     m_windowParent = NULL;


@@ -146,6 +145,7 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
            const wxString& name)
 {
     // Generic
            const wxString& name)
 {
     // Generic

+    m_isWindow = TRUE; // An optimization

     m_windowId = 0;
     m_windowStyle = 0;
     m_windowParent = NULL;
     m_windowId = 0;
     m_windowStyle = 0;
     m_windowParent = NULL;


@@ -1125,7 +1125,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);
 }