Removed XPM lib references from makefile

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

diff --git a/src/qt/frame.cpp b/src/qt/frame.cpp
index 3d9b5b0004e91e379159f529fd7de353be1eb852..8807b62f892333fc4c4cccd3883db37819a77f1f 100644 (file)
--- a/src/qt/frame.cpp
+++ b/src/qt/frame.cpp
@@ -21,7 +21,6 @@
 extern wxList wxModelessWindows;
 extern wxList wxPendingDelete;
 
 extern wxList wxModelessWindows;
 extern wxList wxPendingDelete;
 

-#if !USE_SHARED_LIBRARY

 BEGIN_EVENT_TABLE(wxFrame, wxWindow)
   EVT_SIZE(wxFrame::OnSize)
   EVT_ACTIVATE(wxFrame::OnActivate)
 BEGIN_EVENT_TABLE(wxFrame, wxWindow)
   EVT_SIZE(wxFrame::OnSize)
   EVT_ACTIVATE(wxFrame::OnActivate)


@@ -32,9 +31,8 @@ BEGIN_EVENT_TABLE(wxFrame, wxWindow)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)

-#endif

 
 

-#if USE_NATIVE_STATUSBAR
+#if wxUSE_NATIVE_STATUSBAR

 bool wxFrame::m_useNativeStatusBar = TRUE;
 #else
 bool wxFrame::m_useNativeStatusBar = FALSE;
 bool wxFrame::m_useNativeStatusBar = TRUE;
 #else
 bool wxFrame::m_useNativeStatusBar = FALSE;


@@ -312,7 +310,7 @@ void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 void wxFrame::OnSize(wxSizeEvent& event)
 {
   // if we're using constraints - do use them
 void wxFrame::OnSize(wxSizeEvent& event)
 {
   // if we're using constraints - do use them

-  #if USE_CONSTRAINTS
+  #if wxUSE_CONSTRAINTS

     if ( GetAutoLayout() ) {
       Layout();
       return;
     if ( GetAutoLayout() ) {
       Layout();
       return;


@@ -367,21 +365,10 @@ void wxFrame::OnActivate(wxActivateEvent& event)
   }
 }
 
   }
 }
 

-// The default implementation for the close window event - calls
-// OnClose for backward compatibility.
-
+// The default implementation for the close window event.

 void wxFrame::OnCloseWindow(wxCloseEvent& event)
 {
 void wxFrame::OnCloseWindow(wxCloseEvent& event)
 {

-    // Compatibility
-    if ( GetEventHandler()->OnClose() || event.GetForce())
-    {
-        this->Destroy();
-    }
-}
-
-bool wxFrame::OnClose()
-{
-    return TRUE;
+    this->Destroy();

 }
 
 // Destroy the window (delayed, if a managed window)
 }
 
 // Destroy the window (delayed, if a managed window)