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

Replace WXMAX() macro in wxSearchCtrl code with wxMax()

Browse Source 
Don't invent yet another std::max-macro. We probably could just use the
standard function instead but for now use wxMax(), for consistency with
the rest of the code base.

No real changes.
This commit is contained in:
Vadim Zeitlin
2018-07-07 00:55:35 +02:00
parent 6ed3865925
commit 18899ce4bc
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/generic/srchctlg.cpp
View File

@@ -28,8 +28,7 @@
#if !wxUSE_NATIVE_SEARCH_CONTROL #if !wxUSE_NATIVE_SEARCH_CONTROL
#include "wx/image.h" #include "wx/image.h"
#include "wx/utils.h"
#define WXMAX(a,b) ((a)>(b)?(a):(b))
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// constants // constants
@@ -1013,7 +1012,7 @@ wxBitmap wxSearchCtrl::RenderSearchBitmap( int x, int y, bool renderDrop )
mem.SetPen( wxPen(fg) ); mem.SetPen( wxPen(fg) );
mem.SetBrush( wxBrush(fg) ); mem.SetBrush( wxBrush(fg) );
int handleCornerShift = penWidth * 707 / 1000 / 2; // 707 / 1000 = 0.707 = 1/sqrt(2); int handleCornerShift = penWidth * 707 / 1000 / 2; // 707 / 1000 = 0.707 = 1/sqrt(2);
handleCornerShift = WXMAX( handleCornerShift, 1 ); handleCornerShift = wxMax( handleCornerShift, 1 );
int handleBase = 4 * x / 20; int handleBase = 4 * x / 20;
int handleLength = 2*handleBase+1; int handleLength = 2*handleBase+1;
wxPoint handlePolygon[] = wxPoint handlePolygon[] =
@@ -1112,7 +1111,7 @@ wxBitmap wxSearchCtrl::RenderCancelBitmap( int x, int y )
mem.SetPen( wxPen(bg) ); mem.SetPen( wxPen(bg) );
mem.SetBrush( wxBrush(bg) ); mem.SetBrush( wxBrush(bg) );
int handleCornerShift = penWidth/2; int handleCornerShift = penWidth/2;
handleCornerShift = WXMAX( handleCornerShift, 1 ); handleCornerShift = wxMax( handleCornerShift, 1 );
wxPoint handlePolygon[] = wxPoint handlePolygon[] =
{ {
wxPoint(-handleCornerShift,+handleCornerShift), wxPoint(-handleCornerShift,+handleCornerShift),