SetBackgroundStyle(wxBG_STYLE_CUSTOM) can now be used to optimize

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

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 47ffe0393b81e4eaa77fca10418bd946181c3763..5af91e126a5f65d44cbaa0cd534c35ce7a8039f0 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -217,8 +217,6 @@ bool wxRect::Intersects(const wxRect& rect) const
 // wxColourDatabase
 // ============================================================================
 
 // wxColourDatabase
 // ============================================================================
 

-WX_DECLARE_STRING_HASH_MAP( wxColour *, wxStringToColourHashMap );
-

 // ----------------------------------------------------------------------------
 // wxColourDatabase ctor/dtor
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxColourDatabase ctor/dtor
 // ----------------------------------------------------------------------------


@@ -331,7 +329,7 @@ void wxColourDatabase::Initialize()
         {wxT("WHEAT"), 216, 216, 191},
         {wxT("WHITE"), 255, 255, 255},
         {wxT("YELLOW"), 255, 255, 0},
         {wxT("WHEAT"), 216, 216, 191},
         {wxT("WHITE"), 255, 255, 255},
         {wxT("YELLOW"), 255, 255, 0},

-        {wxT("YELLOW GREEN"), 153, 204, 50},
+        {wxT("YELLOW GREEN"), 153, 204, 50}

     };
 
     size_t n;
     };
 
     size_t n;


@@ -473,6 +471,15 @@ wxString wxColourDatabase::FindName(const wxColour& colour) const
 
 wxColour *wxColourDatabase::FindColour(const wxString& name)
 {
 
 wxColour *wxColourDatabase::FindColour(const wxString& name)
 {

+    // This function is deprecated, use Find() instead.
+    // Formerly this function sometimes would return a deletable pointer and
+    // sometimes a non-deletable one (when returning a colour from the database).
+    // Trying to delete the latter anyway results in problems, so probably
+    // nobody ever freed the pointers. Currently it always returns a new
+    // instance, which means there will be memory leaks.
+    wxLogDebug(wxT("wxColourDataBase::FindColour():")
+        wxT(" Please use wxColourDataBase::Find() instead"));
+

     // using a static variable here is not the most elegant solution but unless
     // we want to make wxStringToColourHashMap public (i.e. move it to the
     // header) so that we could have a member function returning
     // using a static variable here is not the most elegant solution but unless
     // we want to make wxStringToColourHashMap public (i.e. move it to the
     // header) so that we could have a member function returning


@@ -481,13 +488,14 @@ wxColour *wxColourDatabase::FindColour(const wxString& name)
     //
     // and knowing that this function is going to disappear in the next release
     // anyhow I don't want to waste time on this
     //
     // and knowing that this function is going to disappear in the next release
     // anyhow I don't want to waste time on this

+

     static wxColour s_col;
 
     s_col = Find(name);
     if ( !s_col.Ok() )
         return NULL;
 
     static wxColour s_col;
 
     s_col = Find(name);
     if ( !s_col.Ok() )
         return NULL;
 

-    return &s_col;
+    return new wxColour(s_col);

 }
 
 // ============================================================================
 }
 
 // ============================================================================


@@ -521,6 +529,7 @@ void wxInitializeStockObjects ()
 #endif
 */
 #if defined(__WXMAC__)
 #endif
 */
 #if defined(__WXMAC__)

+    // retrieve size of system font for all stock fonts

     int sizeFont = 12;
 
     Str255 fontName ;
     int sizeFont = 12;
 
     Str255 fontName ;


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

+#if __WXMAC_CLASSIC__

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

+#else
+    wxNORMAL_FONT = new wxFont () ;
+    wxNORMAL_FONT->MacCreateThemeFont( kThemeSystemFont );
+#endif

 #elif defined(__WXPM__)
   static const int sizeFont = 12;
 #else
 #elif defined(__WXPM__)
   static const int sizeFont = 12;
 #else


@@ -549,8 +563,13 @@ 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__

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

+#else
+    wxSMALL_FONT = new wxFont () ;
+    wxSMALL_FONT->MacCreateThemeFont( kThemeSmallSystemFont );
+#endif

 #else
   wxSMALL_FONT = new wxFont (sizeFont - 2, wxSWISS, wxNORMAL, wxNORMAL);
   wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);
 #else
   wxSMALL_FONT = new wxFont (sizeFont - 2, wxSWISS, wxNORMAL, wxNORMAL);
   wxITALIC_FONT = new wxFont (sizeFont, wxROMAN, wxITALIC, wxNORMAL);