diff --git a/include/wx/propgrid/manager.h b/include/wx/propgrid/manager.h index bc12292332..6569aadc34 100644 --- a/include/wx/propgrid/manager.h +++ b/include/wx/propgrid/manager.h @@ -266,7 +266,7 @@ public: switching. */ wxPropertyGridPage* AddPage( const wxString& label = wxEmptyString, - const wxBitmap& bmp = wxPG_NULL_BITMAP, + const wxBitmap& bmp = wxNullBitmap, wxPropertyGridPage* pageObj = NULL ) { return InsertPage(-1, label, bmp, pageObj); diff --git a/include/wx/propgrid/propgriddefs.h b/include/wx/propgrid/propgriddefs.h index bed733cda2..d6e1c79214 100644 --- a/include/wx/propgrid/propgriddefs.h +++ b/include/wx/propgrid/propgriddefs.h @@ -235,7 +235,9 @@ class wxPGValidationInfo; // This is the value placed in wxPGProperty::sm_wxPG_LABEL #define wxPG_LABEL_STRING wxS("@!") +#if WXWIN_COMPATIBILITY_3_0 #define wxPG_NULL_BITMAP wxNullBitmap +#endif // WXWIN_COMPATIBILITY_3_0 #define wxPG_COLOUR_BLACK (*wxBLACK) /** Convert Red, Green and Blue to a single 32-bit value.