Correct positioning of the entry text dialog.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/generic/textdlgg.h

@@ -78,8 +78,8 @@ wxGetTextFromUser(const wxString& message,
                   const wxString& caption = wxGetTextFromUserPromptStr,
                   const wxString& default_value = wxEmptyString,
                   wxWindow *parent = (wxWindow *) NULL,
-                  int x = wxDefaultCoord,
+                  wxCoord x = wxDefaultCoord,
-                  int y = wxDefaultCoord,
+                  wxCoord y = wxDefaultCoord,
                   bool centre = true);
 
 wxString WXDLLEXPORT

src/common/utilscmn.cpp

@@ -788,10 +788,18 @@ int wxMessageBox(const wxString& message, const wxString& caption, long style,
 
 wxString wxGetTextFromUser(const wxString& message, const wxString& caption,
                         const wxString& defaultValue, wxWindow *parent,
-                        int x, int y, bool WXUNUSED(centre) )
+                        wxCoord x, wxCoord y, bool centre )
 {
     wxString str;
-    wxTextEntryDialog dialog(parent, message, caption, defaultValue, wxOK|wxCANCEL, wxPoint(x, y));
+    long style = wxTextEntryDialogStyle;
+
+    if (centre)
+        style |= wxCENTRE;
+    else
+        style &= ~wxCENTRE;
+
+    wxTextEntryDialog dialog(parent, message, caption, defaultValue, style, wxPoint(x, y));
+
     if (dialog.ShowModal() == wxID_OK)
     {
         str = dialog.GetValue();

src/generic/textdlgg.cpp

@@ -112,6 +112,7 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
+    if ( ( style & wxCENTRE ) == wxCENTRE )
         Centre( wxBOTH );
 
     m_textctrl->SetSelection(-1, -1);