]> git.saurik.com Git - wxWidgets.git/blobdiff - src/generic/textdlgg.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
wxMenu compile fix
[wxWidgets.git] / src / generic / textdlgg.cpp
diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp
index d4ce2cdc1df82854c28e93b0f8c7c34d02b6f62e..ea9700ee66d243bd8aa75796df45642138c50a0a 100644 (file)
--- a/src/generic/textdlgg.cpp
+++ b/src/generic/textdlgg.cpp
@@ -6,157 +6,132 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
 #ifdef __GNUG__
 #ifdef __GNUG__
-#pragma implementation "textdlgg.h"
+    #pragma implementation "textdlgg.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP
-#include <stdio.h>
-#include "wx/utils.h"
-#include "wx/dialog.h"
-#include "wx/listbox.h"
-#include "wx/button.h"
-#include "wx/stattext.h"
-#include "wx/textctrl.h"
-#include "wx/layout.h"
-#include "wx/intl.h"
+    #include <stdio.h>
+
+    #include "wx/utils.h"
+    #include "wx/dialog.h"
+    #include "wx/button.h"
+    #include "wx/stattext.h"
+    #include "wx/textctrl.h"
+    #include "wx/intl.h"
+#endif
+
+#if wxUSE_STATLINE
+    #include "wx/statline.h"
 #endif
 
 #include "wx/generic/textdlgg.h"
 
 #endif
 
 #include "wx/generic/textdlgg.h"
 
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+#define wxID_TEXT 3000
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
 // wxTextEntryDialog
 // wxTextEntryDialog
+// ----------------------------------------------------------------------------
 
 #if !USE_SHARED_LIBRARY
 BEGIN_EVENT_TABLE(wxTextEntryDialog, wxDialog)
 
 #if !USE_SHARED_LIBRARY
 BEGIN_EVENT_TABLE(wxTextEntryDialog, wxDialog)
-       EVT_BUTTON(wxID_OK, wxTextEntryDialog::OnOK)
+    EVT_BUTTON(wxID_OK, wxTextEntryDialog::OnOK)
 END_EVENT_TABLE()
 
 IMPLEMENT_CLASS(wxTextEntryDialog, wxDialog)
 #endif
 
 END_EVENT_TABLE()
 
 IMPLEMENT_CLASS(wxTextEntryDialog, wxDialog)
 #endif
 
-// Split message, using constraints to position controls
-static void wxSplitMessage2(const char *message, wxList *messageList, wxWindow *parent, wxRowColSizer *sizer)
+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),
+                   m_value(value)
 {
 {
-  char *copyMessage = copystring(message);
-  size_t i = 0;
-  size_t len = strlen(copyMessage);
-  char *currentMessage = copyMessage;
-
-//  wxWindow *lastWindow = parent;
-
-  while (i < len) {
-    while ((i < len) && (copyMessage[i] != '\n')) i++;
-    if (i < len) copyMessage[i] = 0;
-    wxStaticText *mess = new wxStaticText(parent, -1, currentMessage);
-
-/*
-    wxLayoutConstraints *c = new wxLayoutConstraints;
-    c->left.SameAs             (parent, wxLeft, 10);
-    c->top.SameAs              (lastWindow, wxBottom, 5);
-    c->right.AsIs                      ();
-    c->height.AsIs                     ();
-
-    mess->SetConstraints(c);
-*/
-    sizer->AddSizerChild(mess);
-
-    messageList->Append(mess);
-
-    currentMessage = copyMessage + i + 1;
-  }
-  delete[] copyMessage;
-}
-
-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)
-{
-       m_dialogStyle = style;
-       m_value = value;
-
-       wxBeginBusyCursor();
-
-       wxSizer *topSizer = new wxSizer(this, wxSizerShrink);
-       topSizer->SetBorder(10, 10);
-
-       wxRowColSizer *messageSizer = new wxRowColSizer(topSizer, wxSIZER_COLS, 100);
-       messageSizer->SetName("messageSizer");
-
-//    bool centre = ((style & wxCENTRE) == wxCENTRE);
-
-       wxList messageList;
-       wxSplitMessage2(message, &messageList, this, messageSizer);
-
-       // Insert a spacer
-       wxSpacingSizer *spacingSizer = new wxSpacingSizer(topSizer, wxBelow, messageSizer, 10);
-
-       wxTextCtrl *textCtrl = new wxTextCtrl(this, wxID_TEXT, value, wxPoint(-1, -1), wxSize(350, -1));
-
-       wxRowColSizer *textSizer = new wxRowColSizer(topSizer, wxSIZER_ROWS);
-       textSizer->AddSizerChild(textCtrl);
-       textSizer->SetName("textSizer");
-
-       // Create constraints for the text sizer
-       wxLayoutConstraints *textC = new wxLayoutConstraints;
-       textC->left.SameAs              (messageSizer, wxLeft);
-       textC->top.Below                (spacingSizer);
-       textSizer->SetConstraints(textC);
-
-       // Insert another spacer
-       wxSpacingSizer *spacingSizer2 = new wxSpacingSizer(topSizer, wxBelow, textSizer, 10);
-       spacingSizer->SetName("spacingSizer2");
-
-       // Insert a sizer for the buttons
-       wxRowColSizer *buttonSizer = new wxRowColSizer(topSizer, wxSIZER_ROWS);
-       buttonSizer->SetName("buttonSizer");
-
-       // Specify constraints for the button sizer
-       wxLayoutConstraints *c = new wxLayoutConstraints;
-       c->width.AsIs           ();
-       c->height.AsIs          ();
-       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"), wxDefaultPosition, wxSize(75,-1));
-       buttonSizer->AddSizerChild(ok);
-  }
-
-  if (style & wxCANCEL) {
-    cancel = new wxButton(this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize(75,-1));
-       buttonSizer->AddSizerChild(cancel);
-  }
-
-  if (ok)
-    ok->SetDefault();
-
-  Layout();
-  Centre(wxBOTH);
-
-  wxEndBusyCursor();
+    // calculate the sizes
+    // -------------------
+
+    wxArrayString lines;
+    wxSize sizeText = SplitTextMessage(message, &lines);
+
+    wxSize sizeBtn = GetStandardButtonSize();
+
+    long wText = wxMax(4*sizeBtn.GetWidth(), sizeText.GetWidth());
+    long hText = GetStandardTextHeight();
+
+    long wDialog = 4*LAYOUT_X_MARGIN + wText;
+    long hDialog = 2*LAYOUT_Y_MARGIN +
+                   sizeText.GetHeight() * lines.GetCount() +
+                   2*LAYOUT_Y_MARGIN +
+                   hText +
+                   2*LAYOUT_Y_MARGIN +
+                   sizeBtn.GetHeight() +
+                   2*LAYOUT_Y_MARGIN;
+
+    // create the controls
+    // -------------------
+
+    // message
+    long x = 2*LAYOUT_X_MARGIN;
+    long y = CreateTextMessage(lines,
+                               wxPoint(x, 2*LAYOUT_Y_MARGIN),
+                               sizeText);
+
+    y += 2*LAYOUT_X_MARGIN;
+
+    // text ctrl
+    m_textctrl = new wxTextCtrl(this, wxID_TEXT, m_value,
+                                wxPoint(x, y),
+                                wxSize(wText, hText));
+    y += hText + 2*LAYOUT_X_MARGIN;
+
+    // and buttons
+    CreateStandardButtons(wDialog, y, sizeBtn.GetWidth(), sizeBtn.GetHeight());
+
+    // set the dialog size and position
+    SetClientSize(wDialog, hDialog);
+    if ( pos == wxDefaultPosition )
+    {
+        // centre the dialog if no explicit position given
+        Centre(wxBOTH | wxCENTER_FRAME);
+    }
+
+    m_textctrl->SetFocus();
 }
 
 void wxTextEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event) )
 {
 }
 
 void wxTextEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event) )
 {
-       wxTextCtrl *textCtrl = (wxTextCtrl *)FindWindow(wxID_TEXT);
-       if ( textCtrl )
-               m_value = textCtrl->GetValue();
+    m_value = m_textctrl->GetValue();
 
 
-       EndModal(wxID_OK);
+    EndModal(wxID_OK);
 }
 
 }
 
wxWidgets (Impactor)