icon support moved to wxBitmap, allowing for fully transparent usage

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

diff --git a/src/qt/mdi.cpp b/src/qt/mdi.cpp
index bcd7785c0dbcdce0b0dbdcca2f8ec97e59d0b1aa..7ece99f432e2b73b831eafbcf25321cf49b436cd 100644 (file)
--- a/src/qt/mdi.cpp
+++ b/src/qt/mdi.cpp
@@ -17,7 +17,6 @@
 
 extern wxList wxModelessWindows;
 
 
 extern wxList wxModelessWindows;
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)


@@ -32,7 +31,6 @@ BEGIN_EVENT_TABLE(wxMDIClientWindow, wxWindow)
   EVT_SCROLL(wxMDIClientWindow::OnScroll)
 END_EVENT_TABLE()
 
   EVT_SCROLL(wxMDIClientWindow::OnScroll)
 END_EVENT_TABLE()
 

-#endif

 
 // Parent frame
 
 
 // Parent frame
 


@@ -95,7 +93,7 @@ void wxMDIParentFrame::SetMenuBar(wxMenuBar *menu_bar)
 
 void wxMDIParentFrame::OnSize(wxSizeEvent& event)
 {
 
 void wxMDIParentFrame::OnSize(wxSizeEvent& event)
 {

-#if USE_CONSTRAINTS
+#if wxUSE_CONSTRAINTS

     if (GetAutoLayout())
       Layout();
 #endif
     if (GetAutoLayout())
       Layout();
 #endif