X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/837e57436a89516a5fa9f478f401e06bd872c17c..2d3112adc94f2ecdbcfcacf32576f47345e762ae:/src/msw/minifram.cpp?ds=inline

diff --git a/src/msw/minifram.cpp b/src/msw/minifram.cpp
index 016e7e775a..e76e9f15de 100644
--- a/src/msw/minifram.cpp
+++ b/src/msw/minifram.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -30,19 +30,28 @@
 #include "wx/utils.h"
 #endif
 
+
+#ifdef __WIN32__
+
+#include "wx/minifram.h"
+
+IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
+
+
+#else
+
+
 #if wxUSE_ITSY_BITSY
 
 #include "wx/minifram.h"
 
 #ifndef __TWIN32__
-#ifdef __GNUWIN32__
-#include "wx/msw/gnuwin32/extra.h"
-#endif
+    #ifdef __GNUWIN32_OLD__
+        #include "wx/msw/gnuwin32/extra.h"
+    #endif
 #endif
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
-#endif
 
 long wxMiniFrame::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
@@ -166,13 +175,13 @@ wxMiniFrame::~wxMiniFrame(void)
 #define HASCAPTION( hwnd )    (TestWinStyle( hwnd, IBS_VERTCAPTION ) ||\
                                TestWinStyle( hwnd, IBS_HORZCAPTION ))
                                
-#define SETCAPTIONSIZE(h,i)   (UINT)SetProp(h,_T("ibSize"),(HANDLE)i)
-#define GETCAPTIONSIZE(h)     (UINT)GetProp(h,_T("ibSize"))
-#define FREECAPTIONSIZE(h)    RemoveProp(h,_T("ibSize"))
+#define SETCAPTIONSIZE(h,i)   (UINT)SetProp(h,wxT("ibSize"),(HANDLE)i)
+#define GETCAPTIONSIZE(h)     (UINT)GetProp(h,wxT("ibSize"))
+#define FREECAPTIONSIZE(h)    RemoveProp(h,wxT("ibSize"))
 
-#define SETMENUWASUPFLAG(h,i) (UINT)SetProp(h,_T("ibFlag"),(HANDLE)i)
-#define GETMENUWASUPFLAG(h)   (UINT)GetProp(h,_T("ibFlag"))
-#define FREEMENUWASUPFLAG(h)  RemoveProp(h,_T("ibFlag"))
+#define SETMENUWASUPFLAG(h,i) (UINT)SetProp(h,wxT("ibFlag"),(HANDLE)i)
+#define GETMENUWASUPFLAG(h)   (UINT)GetProp(h,wxT("ibFlag"))
+#define FREEMENUWASUPFLAG(h)  RemoveProp(h,wxT("ibFlag"))
 
 /////////////////////////////////////////////////////////////////////
 // Little known fact:
@@ -390,7 +399,7 @@ LRESULT WINAPI ibDefWindowProc( HWND hWnd, UINT uiMsg, WPARAM wParam, LPARAM lPa
                 {
                     // VZ: I don't know what should be here, but the vars must
                     //     be inited!
-                    wxFAIL_MSG(_T("don't know how to initialize cx, cy"));
+                    wxFAIL_MSG(wxT("don't know how to initialize cx, cy"));
 
                     cx = cy = 0;
                 }
@@ -901,7 +910,7 @@ BOOL PASCAL DrawCaption( HDC hDC, HWND hWnd, LPRECT lprc,
             {
                 // Can only rotate true type fonts (well, ok, we could
                 // try and use "modern").
-                wxStrcpy( lf.lfFaceName, _T("Arial") ) ;
+                wxStrcpy( lf.lfFaceName, wxT("Arial") ) ;
                 lf.lfPitchAndFamily = FF_SWISS | 0x04;
                 lf.lfEscapement = 900 ;
 
@@ -968,7 +977,7 @@ BOOL PASCAL DrawCaption( HDC hDC, HWND hWnd, LPRECT lprc,
             SetBkMode( hDC, nBkMode ) ;
             
 #ifdef __WIN16__
-            GlobalFreePtr( (unsigned int) lpsz ) ;
+            GlobalFreePtr( (unsigned int)(DWORD) lpsz ) ;
 #else
             GlobalFreePtr( lpsz ) ;
 #endif
@@ -1608,3 +1617,5 @@ void PASCAL DrawArrow( HDC hdc, LPRECT lprc, UINT uiStyle )
 }  // DrawArrow()   
 
 #endif // wxUSE_ITSY_BITSY
+
+#endif // __WIN32__