wxRegion fixes (off by one)

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

diff --git a/src/msw/minifram.cpp b/src/msw/minifram.cpp
index ce0bee53ec3370637382b5ce797c112080ebf659..e76e9f15dec0f75f9e7cf2297d7f2f1fad037acb 100644 (file)
--- 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
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -35,9 +35,7 @@
 
 #include "wx/minifram.h"
 
 
 #include "wx/minifram.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)

-#endif

 
 
 #else
 
 
 #else


@@ -48,16 +46,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
 #include "wx/minifram.h"
 
 #ifndef __TWIN32__
 #include "wx/minifram.h"
 
 #ifndef __TWIN32__

-#ifdef __GNUWIN32__
-#ifndef wxUSE_NORLANDER_HEADERS
-#include "wx/msw/gnuwin32/extra.h"
-#endif
-#endif
+    #ifdef __GNUWIN32_OLD__
+        #include "wx/msw/gnuwin32/extra.h"
+    #endif

 #endif
 
 #endif
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)

-#endif

 
 long wxMiniFrame::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
 
 long wxMiniFrame::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {


@@ -181,13 +175,13 @@ wxMiniFrame::~wxMiniFrame(void)
 #define HASCAPTION( hwnd )    (TestWinStyle( hwnd, IBS_VERTCAPTION ) ||\
                                TestWinStyle( hwnd, IBS_HORZCAPTION ))
                                
 #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:
 
 /////////////////////////////////////////////////////////////////////
 // Little known fact:


@@ -405,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!
                 {
                     // 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;
                 }
 
                     cx = cy = 0;
                 }


@@ -916,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").
             {
                 // 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 ;
 
                 lf.lfPitchAndFamily = FF_SWISS | 0x04;
                 lf.lfEscapement = 900 ;