X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f631217a9acf6073c95f9d8ce6e3df794e5953e..e91e1e3d5cab263883c1cee1689c898b8f7c4ecd:/include/wx/propgrid/advprops.h

diff --git a/include/wx/propgrid/advprops.h b/include/wx/propgrid/advprops.h
index 34306a3caf..16930c4bb9 100644
--- a/include/wx/propgrid/advprops.h
+++ b/include/wx/propgrid/advprops.h
@@ -4,7 +4,6 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     2004-09-25
-// RCS-ID:      $Id$
 // Copyright:   (c) Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -203,7 +202,8 @@ public:
         Override in derived class to customize how colours are printed as
         strings.
     */
-    virtual wxString ColourToString( const wxColour& col, int index ) const;
+    virtual wxString ColourToString( const wxColour& col, int index,
+                                     int argFlags = 0 ) const;
 
     /** Returns index of entry that triggers colour picker dialog
         (default is last).
@@ -329,6 +329,10 @@ public:
 protected:
     wxBitmap*   m_pBitmap; // final thumbnail area
     wxImage*    m_pImage; // intermediate thumbnail area
+
+private:
+    // Initialize m_pImage using the current file name.
+    void LoadImageFromFile();
 };
 
 #endif