Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use wxNullBitmap explicitly instead of wxPG_NULL_BITMAP.

Browse Source 
wxPG_NULL_BITMAP macro is not useful because is used only once. In the rest of wxPG code wxNullBitmap is used explicitly many times so for the sake of consistency we can resign from using this macro.
This commit is contained in:
Artur Wieczorek
2015-07-17 22:29:37 +02:00
parent 15d8dae6ff
commit a0afc17c75
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/propgrid/manager.h
View File

@@ -266,7 +266,7 @@ public:
switching. switching.
*/ */
wxPropertyGridPage* AddPage( const wxString& label = wxEmptyString, wxPropertyGridPage* AddPage( const wxString& label = wxEmptyString,
const wxBitmap& bmp = wxPG_NULL_BITMAP, const wxBitmap& bmp = wxNullBitmap,
wxPropertyGridPage* pageObj = NULL ) wxPropertyGridPage* pageObj = NULL )
{ {
return InsertPage(-1, label, bmp, pageObj); return InsertPage(-1, label, bmp, pageObj);

2
include/wx/propgrid/propgriddefs.h
View File

@@ -235,7 +235,9 @@ class wxPGValidationInfo;
// This is the value placed in wxPGProperty::sm_wxPG_LABEL // This is the value placed in wxPGProperty::sm_wxPG_LABEL
#define wxPG_LABEL_STRING wxS("@!") #define wxPG_LABEL_STRING wxS("@!")
#if WXWIN_COMPATIBILITY_3_0
#define wxPG_NULL_BITMAP wxNullBitmap #define wxPG_NULL_BITMAP wxNullBitmap
#endif // WXWIN_COMPATIBILITY_3_0
#define wxPG_COLOUR_BLACK (*wxBLACK) #define wxPG_COLOUR_BLACK (*wxBLACK)
/** Convert Red, Green and Blue to a single 32-bit value. /** Convert Red, Green and Blue to a single 32-bit value.