use best size instead of hard coded 80*26 in SetSize(wxSIZE_AUTO)

[wxWidgets.git] / src / generic / progdlgg.cpp

diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index 4bdb7c3fea972777a5e0eb29bdca47c5d8c9a087..fa6c17e78886e607a0a6a435c04a2d819d7f75d6 100644 (file)
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "progdlgg.h"
 #endif
 
     #pragma implementation "progdlgg.h"
 #endif
 


@@ -270,7 +270,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
     wxYield();
 
 #ifdef __WXMAC__
     wxYield();
 
 #ifdef __WXMAC__

-    MacUpdateImmediately();
+    Update();

 #endif
 }
 
 #endif
 }
 


@@ -284,7 +284,7 @@ wxStaticText *wxProgressDialog::CreateLabel(const wxString& text,
 
     // VZ: I like the labels be centered - if the others don't mind, you may
     //     remove "#ifdef __WXMSW__" and use it for all ports
 
     // VZ: I like the labels be centered - if the others don't mind, you may
     //     remove "#ifdef __WXMSW__" and use it for all ports

-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WXMSW__) || defined(__WXPM__) || defined(__WXMAC__)

     c->left.SameAs(this, wxCentreX, LAYOUT_X_MARGIN);
 #else // !MSW
     c->right.SameAs(this, wxRight, 2*LAYOUT_X_MARGIN);
     c->left.SameAs(this, wxCentreX, LAYOUT_X_MARGIN);
 #else // !MSW
     c->right.SameAs(this, wxRight, 2*LAYOUT_X_MARGIN);


@@ -391,7 +391,7 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
     }
 
 #ifdef __WXMAC__
     }
 
 #ifdef __WXMAC__

-    MacUpdateImmediately();
+    Update();

 #endif
 
     return m_state != Canceled;
 #endif
 
     return m_state != Canceled;