Skip to content

Commit 91f6329

Browse files
committed
'fix' warnings
1 parent ccaca80 commit 91f6329

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

source/gui/detail/bedrock_windows.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -742,11 +742,11 @@ namespace detail
742742
unsigned width = static_cast<unsigned>(r->right - r->left) - wd->extra_width;
743743
unsigned height = static_cast<unsigned>(r->bottom - r->top ) - wd->extra_height;
744744

745-
if(wd->max_track_size.width && (wd->max_track_size.width < req_width)) req_width = wd->max_track_size.width;
746-
else if(wd->min_track_size.width && (wd->min_track_size.width > req_width)) req_width = wd->min_track_size.width;
745+
if (wd->max_track_size.width && (wd->max_track_size.width < req_width )) req_width = wd->max_track_size.width;
746+
if (wd->min_track_size.width && (wd->min_track_size.width > req_width )) req_width = wd->min_track_size.width;
747747

748-
if(wd->max_track_size.height && (wd->max_track_size.height < req_height)) req_height = wd->max_track_size.height;
749-
else if(wd->min_track_size.height && (wd->min_track_size.height > req_height)) req_height = wd->min_track_size.height;
748+
if (wd->max_track_size.height && (wd->max_track_size.height < req_height)) req_height = wd->max_track_size.height;
749+
if (wd->min_track_size.height && (wd->min_track_size.height > req_height)) req_height = wd->min_track_size.height;
750750

751751
if(req_width != width)
752752
{

source/gui/detail/drawer.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,8 @@ namespace nana
233233
};
234234

235235
drawer::drawer(int dpi)
236-
: data_impl_{ new data_implement },
237-
graphics{ dpi }
236+
: graphics{ dpi },
237+
data_impl_{ new data_implement }
238238
{}
239239

240240
drawer::~drawer()

0 commit comments

Comments
 (0)