repaired recently broken framelayout

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

diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp
index c582cc875f4c2112d255e50d5bdc896228d10eb1..cec7c362177815cc8f5ef6357613bef2f2e9b005 100644 (file)
--- a/src/generic/textdlgg.cpp
+++ b/src/generic/textdlgg.cpp
@@ -45,17 +45,17 @@ IMPLEMENT_CLASS(wxTextEntryDialog, wxDialog)
 #endif
 
 // Split message, using constraints to position controls
-static void wxSplitMessage2(const char *message, wxList *messageList, wxWindow *parent, wxRowColSizer *sizer)
+static void wxSplitMessage2(const wxChar *message, wxList *messageList, wxWindow *parent, wxRowColSizer *sizer)
 {
-  char *copyMessage = copystring(message);
+  wxChar *copyMessage = copystring(message);
   size_t i = 0;
-  size_t len = strlen(copyMessage);
-  char *currentMessage = copyMessage;
+  size_t len = wxStrlen(copyMessage);
+  wxChar *currentMessage = copyMessage;
 
 //  wxWindow *lastWindow = parent;
 
   while (i < len) {
-    while ((i < len) && (copyMessage[i] != '\n')) i++;
+    while ((i < len) && (copyMessage[i] != _T('\n'))) i++;
     if (i < len) copyMessage[i] = 0;
     wxStaticText *mess = new wxStaticText(parent, -1, currentMessage);
 
@@ -79,7 +79,7 @@ static void wxSplitMessage2(const char *message, wxList *messageList, wxWindow *
 
 wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent, const wxString& message, const wxString& caption,
         const wxString& value, long style, const wxPoint& pos):
-       wxDialog(parent, -1, caption, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL)
+       wxDialog(parent, -1, caption, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL|wxTAB_TRAVERSAL)
 {
        m_dialogStyle = style;
        m_value = value;
@@ -127,17 +127,18 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent, const wxString& message,
        c->top.Below            (spacingSizer2);
        c->centreX.SameAs       (textSizer, wxCentreX);
        buttonSizer->SetConstraints(c);
+       buttonSizer->SetSpacing(12,0);
 
     wxButton *ok = NULL;
        wxButton *cancel = NULL;
 
   if (style & wxOK) {
-    ok = new wxButton(this, wxID_OK, _("OK"));
+    ok = new wxButton(this, wxID_OK, _("OK"), wxDefaultPosition, wxSize(75,-1));
        buttonSizer->AddSizerChild(ok);
   }
 
   if (style & wxCANCEL) {
-    cancel = new wxButton(this, wxID_CANCEL, _("Cancel"));
+    cancel = new wxButton(this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize(75,-1));
        buttonSizer->AddSizerChild(cancel);
   }