only set parent frame ontop when the current frame being destructed is active

[wxWidgets.git] / src / msw / minifram.cpp

diff --git a/src/msw/minifram.cpp b/src/msw/minifram.cpp
index 016e7e775a4ed27f0f37241b80bd668b9c4e8782..aee0054b642f3f8ed2ffe5819146daf4b9596582 100644 (file)
--- a/src/msw/minifram.cpp
+++ b/src/msw/minifram.cpp
@@ -30,15 +30,30 @@
 #include "wx/utils.h"
 #endif
 
 #include "wx/utils.h"
 #endif
 

+
+#ifdef __WIN32__
+
+#include "wx/minifram.h"
+
+#if !USE_SHARED_LIBRARY
+IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
+#endif
+
+
+#else
+
+

 #if wxUSE_ITSY_BITSY
 
 #include "wx/minifram.h"
 
 #ifndef __TWIN32__
 #ifdef __GNUWIN32__
 #if wxUSE_ITSY_BITSY
 
 #include "wx/minifram.h"
 
 #ifndef __TWIN32__
 #ifdef __GNUWIN32__

+#ifndef wxUSE_NORLANDER_HEADERS

 #include "wx/msw/gnuwin32/extra.h"
 #endif
 #endif
 #include "wx/msw/gnuwin32/extra.h"
 #endif
 #endif

+#endif

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)


@@ -968,7 +983,7 @@ BOOL PASCAL DrawCaption( HDC hDC, HWND hWnd, LPRECT lprc,
             SetBkMode( hDC, nBkMode ) ;
             
 #ifdef __WIN16__
             SetBkMode( hDC, nBkMode ) ;
             
 #ifdef __WIN16__

-            GlobalFreePtr( (unsigned int) lpsz ) ;
+            GlobalFreePtr( (unsigned int)(DWORD) lpsz ) ;

 #else
             GlobalFreePtr( lpsz ) ;
 #endif
 #else
             GlobalFreePtr( lpsz ) ;
 #endif


@@ -1608,3 +1623,5 @@ void PASCAL DrawArrow( HDC hdc, LPRECT lprc, UINT uiStyle )
 }  // DrawArrow()   
 
 #endif // wxUSE_ITSY_BITSY
 }  // DrawArrow()   
 
 #endif // wxUSE_ITSY_BITSY

+
+#endif // __WIN32__