tiny fixes

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

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 53a1a341179f67e18adf3522870d13c7d893f3c7..dae75bf4ef5e6a54cb15f9e263f9fcdc47646158 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -90,13 +90,13 @@ bool wxRect::operator==(const wxRect& rect) const
 }
 
 const wxRect& wxRect::operator += (const wxRect& rect)
 }
 
 const wxRect& wxRect::operator += (const wxRect& rect)

-{ 
-       *this = (*this + rect); 
+{
+       *this = (*this + rect);

        return ( *this ) ;
 }
 
 wxRect wxRect::operator + (const wxRect& rect) const
        return ( *this ) ;
 }
 
 wxRect wxRect::operator + (const wxRect& rect) const

-{ 
+{

        int x1 = wxMin(this->x, rect.x);
        int y1 = wxMin(this->y, rect.y);
        int y2 = wxMax(y+height, rect.height+rect.y);
        int x1 = wxMin(this->x, rect.x);
        int y1 = wxMin(this->y, rect.y);
        int y2 = wxMax(y+height, rect.height+rect.y);


@@ -144,84 +144,84 @@ void wxColourDatabase::Initialize ()
   static cdef table[]={
 
 // #ifdef __WXMSW__
   static cdef table[]={
 
 // #ifdef __WXMSW__

-   {_T("AQUAMARINE"),112, 219, 147},
-   {_T("BLACK"),0, 0, 0},
-   {_T("BLUE"), 0, 0, 255},
-   {_T("BLUE VIOLET"), 159, 95, 159},
-   {_T("BROWN"), 165, 42, 42},
-   {_T("CADET BLUE"), 95, 159, 159},
-   {_T("CORAL"), 255, 127, 0},
-   {_T("CORNFLOWER BLUE"), 66, 66, 111},
-   {_T("CYAN"), 0, 255, 255},
-   {_T("DARK GREY"), 47, 47, 47},   // ?
-
-   {_T("DARK GREEN"), 47, 79, 47},
-   {_T("DARK OLIVE GREEN"), 79, 79, 47},
-   {_T("DARK ORCHID"), 153, 50, 204},
-   {_T("DARK SLATE BLUE"), 107, 35, 142},
-   {_T("DARK SLATE GREY"), 47, 79, 79},
-   {_T("DARK TURQUOISE"), 112, 147, 219},
-   {_T("DIM GREY"), 84, 84, 84},
-   {_T("FIREBRICK"), 142, 35, 35},
-   {_T("FOREST GREEN"), 35, 142, 35},
-   {_T("GOLD"), 204, 127, 50},
-   {_T("GOLDENROD"), 219, 219, 112},
-   {_T("GREY"), 128, 128, 128},
-   {_T("GREEN"), 0, 255, 0},
-   {_T("GREEN YELLOW"), 147, 219, 112},
-   {_T("INDIAN RED"), 79, 47, 47},
-   {_T("KHAKI"), 159, 159, 95},
-   {_T("LIGHT BLUE"), 191, 216, 216},
-   {_T("LIGHT GREY"), 192, 192, 192},
-   {_T("LIGHT STEEL BLUE"), 143, 143, 188},
-   {_T("LIME GREEN"), 50, 204, 50},
-   {_T("LIGHT MAGENTA"), 255, 0, 255},
-   {_T("MAGENTA"), 255, 0, 255},
-   {_T("MAROON"), 142, 35, 107},
-   {_T("MEDIUM AQUAMARINE"), 50, 204, 153},
-   {_T("MEDIUM GREY"), 100, 100, 100},
-   {_T("MEDIUM BLUE"), 50, 50, 204},
-   {_T("MEDIUM FOREST GREEN"), 107, 142, 35},
-   {_T("MEDIUM GOLDENROD"), 234, 234, 173},
-   {_T("MEDIUM ORCHID"), 147, 112, 219},
-   {_T("MEDIUM SEA GREEN"), 66, 111, 66},
-   {_T("MEDIUM SLATE BLUE"), 127, 0, 255},
-   {_T("MEDIUM SPRING GREEN"), 127, 255, 0},
-   {_T("MEDIUM TURQUOISE"), 112, 219, 219},
-   {_T("MEDIUM VIOLET RED"), 219, 112, 147},
-   {_T("MIDNIGHT BLUE"), 47, 47, 79},
-   {_T("NAVY"), 35, 35, 142},
-   {_T("ORANGE"), 204, 50, 50},
-   {_T("ORANGE RED"), 255, 0, 127},
-   {_T("ORCHID"), 219, 112, 219},
-   {_T("PALE GREEN"), 143, 188, 143},
-   {_T("PINK"), 188, 143, 234},
-   {_T("PLUM"), 234, 173, 234},
-   {_T("PURPLE"), 176, 0, 255},
-   {_T("RED"), 255, 0, 0},
-   {_T("SALMON"), 111, 66, 66},
-   {_T("SEA GREEN"), 35, 142, 107},
-   {_T("SIENNA"), 142, 107, 35},
-   {_T("SKY BLUE"), 50, 153, 204},
-   {_T("SLATE BLUE"), 0, 127, 255},
-   {_T("SPRING GREEN"), 0, 255, 127},
-   {_T("STEEL BLUE"), 35, 107, 142},
-   {_T("TAN"), 219, 147, 112},
-   {_T("THISTLE"), 216, 191, 216},
-   {_T("TURQUOISE"), 173, 234, 234},
-   {_T("VIOLET"), 79, 47, 79},
-   {_T("VIOLET RED"), 204, 50, 153},
-   {_T("WHEAT"), 216, 216, 191},
-   {_T("WHITE"), 255, 255, 255},
-   {_T("YELLOW"), 255, 255, 0},
-   {_T("YELLOW GREEN"), 153, 204, 50},
+   {T("AQUAMARINE"),112, 219, 147},
+   {T("BLACK"),0, 0, 0},
+   {T("BLUE"), 0, 0, 255},
+   {T("BLUE VIOLET"), 159, 95, 159},
+   {T("BROWN"), 165, 42, 42},
+   {T("CADET BLUE"), 95, 159, 159},
+   {T("CORAL"), 255, 127, 0},
+   {T("CORNFLOWER BLUE"), 66, 66, 111},
+   {T("CYAN"), 0, 255, 255},
+   {T("DARK GREY"), 47, 47, 47},   // ?
+
+   {T("DARK GREEN"), 47, 79, 47},
+   {T("DARK OLIVE GREEN"), 79, 79, 47},
+   {T("DARK ORCHID"), 153, 50, 204},
+   {T("DARK SLATE BLUE"), 107, 35, 142},
+   {T("DARK SLATE GREY"), 47, 79, 79},
+   {T("DARK TURQUOISE"), 112, 147, 219},
+   {T("DIM GREY"), 84, 84, 84},
+   {T("FIREBRICK"), 142, 35, 35},
+   {T("FOREST GREEN"), 35, 142, 35},
+   {T("GOLD"), 204, 127, 50},
+   {T("GOLDENROD"), 219, 219, 112},
+   {T("GREY"), 128, 128, 128},
+   {T("GREEN"), 0, 255, 0},
+   {T("GREEN YELLOW"), 147, 219, 112},
+   {T("INDIAN RED"), 79, 47, 47},
+   {T("KHAKI"), 159, 159, 95},
+   {T("LIGHT BLUE"), 191, 216, 216},
+   {T("LIGHT GREY"), 192, 192, 192},
+   {T("LIGHT STEEL BLUE"), 143, 143, 188},
+   {T("LIME GREEN"), 50, 204, 50},
+   {T("LIGHT MAGENTA"), 255, 0, 255},
+   {T("MAGENTA"), 255, 0, 255},
+   {T("MAROON"), 142, 35, 107},
+   {T("MEDIUM AQUAMARINE"), 50, 204, 153},
+   {T("MEDIUM GREY"), 100, 100, 100},
+   {T("MEDIUM BLUE"), 50, 50, 204},
+   {T("MEDIUM FOREST GREEN"), 107, 142, 35},
+   {T("MEDIUM GOLDENROD"), 234, 234, 173},
+   {T("MEDIUM ORCHID"), 147, 112, 219},
+   {T("MEDIUM SEA GREEN"), 66, 111, 66},
+   {T("MEDIUM SLATE BLUE"), 127, 0, 255},
+   {T("MEDIUM SPRING GREEN"), 127, 255, 0},
+   {T("MEDIUM TURQUOISE"), 112, 219, 219},
+   {T("MEDIUM VIOLET RED"), 219, 112, 147},
+   {T("MIDNIGHT BLUE"), 47, 47, 79},
+   {T("NAVY"), 35, 35, 142},
+   {T("ORANGE"), 204, 50, 50},
+   {T("ORANGE RED"), 255, 0, 127},
+   {T("ORCHID"), 219, 112, 219},
+   {T("PALE GREEN"), 143, 188, 143},
+   {T("PINK"), 188, 143, 234},
+   {T("PLUM"), 234, 173, 234},
+   {T("PURPLE"), 176, 0, 255},
+   {T("RED"), 255, 0, 0},
+   {T("SALMON"), 111, 66, 66},
+   {T("SEA GREEN"), 35, 142, 107},
+   {T("SIENNA"), 142, 107, 35},
+   {T("SKY BLUE"), 50, 153, 204},
+   {T("SLATE BLUE"), 0, 127, 255},
+   {T("SPRING GREEN"), 0, 255, 127},
+   {T("STEEL BLUE"), 35, 107, 142},
+   {T("TAN"), 219, 147, 112},
+   {T("THISTLE"), 216, 191, 216},
+   {T("TURQUOISE"), 173, 234, 234},
+   {T("VIOLET"), 79, 47, 79},
+   {T("VIOLET RED"), 204, 50, 153},
+   {T("WHEAT"), 216, 216, 191},
+   {T("WHITE"), 255, 255, 255},
+   {T("YELLOW"), 255, 255, 0},
+   {T("YELLOW GREEN"), 153, 204, 50},

 // #endif
 
 #if defined(__WXGTK__) || defined(__X__)
 // #endif
 
 #if defined(__WXGTK__) || defined(__X__)

-   {_T("MEDIUM GOLDENROD"), 234, 234, 173},
-   {_T("MEDIUM FOREST GREEN"), 107, 142, 35},
-   {_T("LIGHT MAGENTA"), 255, 0, 255},
-   {_T("MEDIUM GREY"), 100, 100, 100},
+   {T("MEDIUM GOLDENROD"), 234, 234, 173},
+   {T("MEDIUM FOREST GREEN"), 107, 142, 35},
+   {T("LIGHT MAGENTA"), 255, 0, 255},
+   {T("MEDIUM GREY"), 100, 100, 100},

 #endif
 
    {0,0,0,0}
 #endif
 
    {0,0,0,0}


@@ -256,6 +256,9 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
 #ifdef __WXMSW__
   else return NULL;
 #endif
 #ifdef __WXMSW__
   else return NULL;
 #endif

+#ifdef __WXPM__
+  else return NULL;
+#endif

 
 // TODO for other implementations. This should really go into
 // platform-specific directories.
 
 // TODO for other implementations. This should really go into
 // platform-specific directories.


@@ -595,8 +598,13 @@ wxFont *wxFontList::
           //#if defined(__X__)
           //          each_font->GetFontId () == FamilyOrFontId) /* New font system */
           //#else
           //#if defined(__X__)
           //          each_font->GetFontId () == FamilyOrFontId) /* New font system */
           //#else

-          each_font->GetFamily () == FamilyOrFontId &&
-          ((each_font->GetFaceName() == _T("")) || each_font->GetFaceName() == Face))
+#if defined(__WXGTK__)
+          (each_font->GetFamily() == FamilyOrFontId ||
+           (each_font->GetFamily() == wxSWISS && FamilyOrFontId == wxDEFAULT)) &&
+#else
+          each_font->GetFamily() == FamilyOrFontId &&
+#endif
+          ((each_font->GetFaceName() == T("")) || each_font->GetFaceName() == Face))

         //#endif
         return each_font;
     }
         //#endif
         return each_font;
     }