diff --git a/source/gui/detail/bedrock_windows.cpp b/source/gui/detail/bedrock_windows.cpp
index b1a84157..4db5d3d2 100644
--- a/source/gui/detail/bedrock_windows.cpp
+++ b/source/gui/detail/bedrock_windows.cpp
@@ -742,11 +742,11 @@ namespace detail
 		unsigned width  = static_cast<unsigned>(r->right  - r->left) - wd->extra_width;
 		unsigned height = static_cast<unsigned>(r->bottom - r->top ) - wd->extra_height;
 
-		     if(wd->max_track_size.width && (wd->max_track_size.width < req_width)) 	req_width = wd->max_track_size.width;
-		else if(wd->min_track_size.width && (wd->min_track_size.width > req_width))	    req_width = wd->min_track_size.width;
+		if (wd->max_track_size.width  && (wd->max_track_size.width  < req_width ))  req_width  = wd->max_track_size.width;
+		if (wd->min_track_size.width  && (wd->min_track_size.width  > req_width ))  req_width  = wd->min_track_size.width;
 
-		     if(wd->max_track_size.height && (wd->max_track_size.height < req_height))	req_height = wd->max_track_size.height;
-		else if(wd->min_track_size.height && (wd->min_track_size.height > req_height))	req_height = wd->min_track_size.height;
+		if (wd->max_track_size.height && (wd->max_track_size.height < req_height))	req_height = wd->max_track_size.height;
+		if (wd->min_track_size.height && (wd->min_track_size.height > req_height))	req_height = wd->min_track_size.height;
 
 		if(req_width != width)
 		{
diff --git a/source/gui/detail/drawer.cpp b/source/gui/detail/drawer.cpp
index 1585f07f..b7ba3bb8 100644
--- a/source/gui/detail/drawer.cpp
+++ b/source/gui/detail/drawer.cpp
@@ -233,8 +233,8 @@ namespace nana
 		};
 
 		drawer::drawer(int dpi)
-			: data_impl_{ new data_implement },
-			  graphics{ dpi }
+			: graphics{ dpi },
+			  data_impl_{ new data_implement }
 		{}
 
 		drawer::~drawer()