From: Włodzimierz Skiba <abx@abx.art.pl>
Date: Thu, 9 Sep 2004 14:14:20 +0000 (+0000)
Subject: Correct positioning of the entry text dialog.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/13d13a9e19af3d596262eee88dc8394de856242d

Correct positioning of the entry text dialog.


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

diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h
index b255dd89a4..f39a29b638 100644
--- a/include/wx/generic/textdlgg.h
+++ b/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,
-                  int y = wxDefaultCoord,
+                  wxCoord x = wxDefaultCoord,
+                  wxCoord y = wxDefaultCoord,
                   bool centre = true);
 
 wxString WXDLLEXPORT
diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 268fdd05f1..6c7f69d3b9 100644
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -19,7 +19,7 @@
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__)
 // Some older compilers (such as EMX) cannot handle
-// #pragma interface/implementation correctly, iff 
+// #pragma interface/implementation correctly, iff
 // #pragma implementation is used in _two_ translation
 // units (as created by e.g. event.cpp compiled for
 // libwx_base and event.cpp compiled for libwx_gui_core).
@@ -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();
diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp
index 46b3f6ea66..cc2c28ebd7 100644
--- a/src/generic/textdlgg.cpp
+++ b/src/generic/textdlgg.cpp
@@ -112,7 +112,8 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
-    Centre( wxBOTH );
+    if ( ( style & wxCENTRE ) == wxCENTRE )
+        Centre( wxBOTH );
 
     m_textctrl->SetSelection(-1, -1);
     m_textctrl->SetFocus();