Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / propgrid / advprops.h

diff --git a/include/wx/propgrid/advprops.h b/include/wx/propgrid/advprops.h
index 076c7677989982dd6006cde4f4e0e0596d1f3d8d..860b89029bd30d9e805727b74ae8758e663dc6ab 100644 (file)
--- a/include/wx/propgrid/advprops.h
+++ b/include/wx/propgrid/advprops.h
@@ -6,12 +6,14 @@
 // Created:     2004-09-25
 // RCS-ID:      $Id$
 // Copyright:   (c) Jaakko Salli
 // Created:     2004-09-25
 // RCS-ID:      $Id$
 // Copyright:   (c) Jaakko Salli

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PROPGRID_ADVPROPS_H_
 #define _WX_PROPGRID_ADVPROPS_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PROPGRID_ADVPROPS_H_
 #define _WX_PROPGRID_ADVPROPS_H_
 

+#include "wx/defs.h"
+

 #if wxUSE_PROPGRID
 
 #include "wx/propgrid/props.h"
 #if wxUSE_PROPGRID
 
 #include "wx/propgrid/props.h"


@@ -201,7 +203,8 @@ public:
         Override in derived class to customize how colours are printed as
         strings.
     */
         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).
 
     /** Returns index of entry that triggers colour picker dialog
         (default is last).