added DoSetNativeFontInfo() to avoid virtual function hiding

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

diff --git a/src/msw/dibutils.cpp b/src/msw/dibutils.cpp
index 6ee22bf3042319fadbeb2a968f3f190f656c45ed..0e10e7b029a1f617bca499c154623b06bfaf5745 100644 (file)
--- a/src/msw/dibutils.cpp
+++ b/src/msw/dibutils.cpp
@@ -32,10 +32,6 @@
 
 #include "wx/msw/dibutils.h"
 
-#ifdef __WXWINE__
-  #include <module.h>
-#endif
-
 #if defined(__WIN32__)
 #if !defined(__MWERKS__) && !defined(__SALFORDC__)
     #include <memory.h>             // for _fmemcpy()
@@ -113,11 +109,7 @@ void wxClearSystemPalette(void)
   }
 
   // *** Create, select, realize, deselect, and delete the palette
-#ifdef __WXWINE__
-  ScreenDC = GetDC((HWND)NULL);
-#else
   ScreenDC = GetDC(NULL);
-#endif
   ScreenPalette = CreatePalette((LOGPALETTE *)&Palette);
 
   if (ScreenPalette)
@@ -128,11 +120,7 @@ void wxClearSystemPalette(void)
     bOK = DeleteObject(ScreenPalette);
   }
 
-#ifdef __WXWINE__
-  nOK = ReleaseDC((HWND)NULL, ScreenDC);
-#else
   nOK = ReleaseDC(NULL, ScreenDC);
-#endif
 
   return;
 }
@@ -195,7 +183,7 @@ PDIB wxDibOpenFile(LPTSTR szFile)
    LPVOID              p;
    OFSTRUCT            of;
 
-#if defined(WIN32) || defined(_WIN32)
+#if defined(__WIN32__)
    #define GetCurrentInstance()    GetModuleHandle(NULL)
 #else
    #define GetCurrentInstance()    (HINSTANCE)SELECTOROF((LPVOID)&of)
@@ -293,7 +281,7 @@ PDIB wxDibReadBitmapInfo(HFILE fh)
     off = _llseek(fh,0L,SEEK_CUR);
 
     if (sizeof(bf) != _lread(fh,(LPSTR)&bf,sizeof(bf)))
-        return FALSE;
+        return NULL;
 
     /*
      *  do we have a RC HEADER?
@@ -305,7 +293,7 @@ PDIB wxDibReadBitmapInfo(HFILE fh)
     }
 
     if (sizeof(bi) != _lread(fh,(LPSTR)&bi,sizeof(bi)))
-        return FALSE;
+        return NULL;
 
     /*
      *  what type of bitmap info is this?