Enclose code using m_macToolbar in #if wxOSX_USE_NATIVE_TOOLBAR.

[wxWidgets.git] / src / msw / gauge.cpp

diff --git a/src/msw/gauge.cpp b/src/msw/gauge.cpp
index 1045bffc6159173e493d9186b9d825fe9b06dbbc..1fcc481c80514535790163230f8fa38d4d8c07e0 100644 (file)
--- a/src/msw/gauge.cpp
+++ b/src/msw/gauge.cpp
@@ -177,12 +177,14 @@ WXDWORD wxGauge::MSWGetStyle(long style, WXDWORD *exstyle) const
 
 wxSize wxGauge::DoGetBestSize() const
 {
 
 wxSize wxGauge::DoGetBestSize() const
 {

-    // VZ: no idea where does 28 come from, it was there before my changes and
-    //     as nobody ever complained I guess we can leave it...
+    // Windows HIG (http://msdn.microsoft.com/en-us/library/aa511279.aspx)
+    // suggest progress bar size of "107 or 237 x 8 dialog units". Let's use
+    // the smaller one.
+

     if (HasFlag(wxGA_VERTICAL))
     if (HasFlag(wxGA_VERTICAL))

-        return wxSize(28, 100);
+        return ConvertDialogToPixels(wxSize(8, 107));

     else
     else

-        return wxSize(100, 28);
+        return ConvertDialogToPixels(wxSize(107, 8));

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------