Backed-out PNG8 patch (no time to look at why

[wxWidgets.git] / src / common / gdicmn.cpp

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 27236ce40aa5d0b2533aafee0f73b989cb4f23c3..58f901a085e271587d47d4f55ee8dc2899705b16 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -42,7 +42,7 @@
 #include "wx/log.h"
 #include <string.h>
 
 #include "wx/log.h"
 #include <string.h>
 

-#ifdef __WXMSW__
+#if defined(__WXMSW__) && !defined(__PALMOS__)

 #include "wx/msw/wrapwin.h"
 #endif
 
 #include "wx/msw/wrapwin.h"
 #endif
 


@@ -125,6 +125,12 @@ wxRect::wxRect(const wxPoint& point, const wxSize& size)
     width = size.x; height = size.y;
 }
 
     width = size.x; height = size.y;
 }
 

+wxRect::wxRect(const wxSize& size)
+{
+    x = 0; y = 0;
+    width = size.x; height = size.y;
+}
+

 bool wxRect::operator==(const wxRect& rect) const
 {
     return ((x == rect.x) &&
 bool wxRect::operator==(const wxRect& rect) const
 {
     return ((x == rect.x) &&


@@ -255,7 +261,7 @@ void wxColourDatabase::Initialize()
     static const struct wxColourDesc
     {
         const wxChar *name;
     static const struct wxColourDesc
     {
         const wxChar *name;

-        int r,g,b;
+        unsigned char r,g,b;

     }
     wxColourTable[] =
     {
     }
     wxColourTable[] =
     {


@@ -538,7 +544,7 @@ void wxInitializeStockObjects ()
 
     GetThemeFont(kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
     sizeFont = fontSize ;
 
     GetThemeFont(kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
     sizeFont = fontSize ;

-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__

     wxNORMAL_FONT = new wxFont (fontSize, wxMODERN, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal(fontName) );
 #else
     wxNORMAL_FONT = new wxFont () ;
     wxNORMAL_FONT = new wxFont (fontSize, wxMODERN, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal(fontName) );
 #else
     wxNORMAL_FONT = new wxFont () ;


@@ -563,7 +569,7 @@ void wxInitializeStockObjects ()
 #elif defined(__WXMAC__)
     wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */
     wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
 #elif defined(__WXMAC__)
     wxSWISS_FONT = new wxFont (sizeFont, wxSWISS, wxNORMAL, wxNORMAL); /* Helv */
     wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);

-#if __WXMAC_CLASSIC__
+#ifdef __WXMAC_CLASSIC__

   GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
     wxSMALL_FONT = new wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal( fontName ) );
 #else
   GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
     wxSMALL_FONT = new wxFont (fontSize, wxSWISS, wxNORMAL, wxNORMAL , false , wxMacMakeStringFromPascal( fontName ) );
 #else


@@ -665,10 +671,6 @@ void wxDeleteStockLists()
 // wxTheXXXList stuff (semi-obsolete)
 // ============================================================================
 
 // wxTheXXXList stuff (semi-obsolete)
 // ============================================================================
 

-wxBitmapList::wxBitmapList()
-{
-}
-

 wxBitmapList::~wxBitmapList ()
 {
     wxList::compatibility_iterator node = GetFirst ();
 wxBitmapList::~wxBitmapList ()
 {
     wxList::compatibility_iterator node = GetFirst ();


@@ -858,7 +860,7 @@ wxFont *wxFontList::FindOrCreateFont(int pointSize,
             // a different font if we create it with empty facename, but it is
             // still better than never matching anything in the cache at all
             // in this case
             // a different font if we create it with empty facename, but it is
             // still better than never matching anything in the cache at all
             // in this case

-            if ( same && !facename.IsEmpty() )
+            if ( same && !facename.empty() )

             {
                 const wxString& fontFace = font->GetFaceName();
 
             {
                 const wxString& fontFace = font->GetFaceName();