Added fix for mingw32 gcc-2.95 regarding FillMemory

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

diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp
index 345d05740e89162a62fb3b74ddd2575cb867ec50..d34210a7c9f6319fe9537b5a67cbc6877fe54b21 100644 (file)
--- a/src/generic/textdlgg.cpp
+++ b/src/generic/textdlgg.cpp
@@ -6,135 +6,116 @@
 // 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"
+    #include "wx/sizer.h"
+#endif
+
+#if wxUSE_STATLINE
+    #include "wx/statline.h"

 #endif
 
 #include "wx/generic/textdlgg.h"
 
 #endif
 
 #include "wx/generic/textdlgg.h"
 

+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+static const int wxID_TEXT = 3000;
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------

 // wxTextEntryDialog
 // wxTextEntryDialog

+// ----------------------------------------------------------------------------

 
 

-#if !USE_SHARED_LIBRARY

 BEGIN_EVENT_TABLE(wxTextEntryDialog, wxDialog)
 BEGIN_EVENT_TABLE(wxTextEntryDialog, wxDialog)

-       EVT_BUTTON(wxID_OK, wxTextEntryDialog::OnOK)
+    EVT_BUTTON(wxID_OK, wxTextEntryDialog::OnOK)

 END_EVENT_TABLE()
 
 IMPLEMENT_CLASS(wxTextEntryDialog, wxDialog)
 END_EVENT_TABLE()
 
 IMPLEMENT_CLASS(wxTextEntryDialog, wxDialog)

-#endif

 
 

-extern 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)
+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)

 {
 {

-       m_dialogStyle = style;
-       m_value = value;
-
-       wxBeginBusyCursor();
+    m_dialogStyle = style;
+    m_value = value;

 
 

-       wxSizer *topSizer = new wxSizer(this, wxSizerShrink);
-       topSizer->SetBorder(10, 10);
+    wxBeginBusyCursor();

 
 

-       wxRowColSizer *messageSizer = new wxRowColSizer(topSizer, wxSIZER_COLS, 100);
-       messageSizer->SetName("messageSizer");
+    wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );

 
 

-//    bool centre = ((style & wxCENTRE) == wxCENTRE);
+    // 1) text message
+    topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 );

 
 

-       wxList messageList;
-       wxSplitMessage2(message, &messageList, this, messageSizer);
+    // 2) text ctrl
+    m_textctrl = new wxTextCtrl(this, wxID_TEXT, value,
+                                wxDefaultPosition, wxSize(300, -1),
+                                style & ~wxTextEntryDialogStyle);
+    topsizer->Add( m_textctrl, 1, wxEXPAND | wxLEFT|wxRIGHT, 15 );

 
 

-       // 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);
+#if wxUSE_STATLINE
+    // 3) static line
+    topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
+#endif

 
 

-    wxButton *ok = NULL;
-       wxButton *cancel = NULL;
+    // 4) buttons
+    topsizer->Add( CreateButtonSizer( style ), 0, wxCENTRE | wxALL, 10 );

 
 

-  if (style & wxOK) {
-    ok = new wxButton(this, wxID_OK, _("OK"));
-       buttonSizer->AddSizerChild(ok);
-  }
+    SetAutoLayout( TRUE );
+    SetSizer( topsizer );

 
 

-  if (style & wxCANCEL) {
-    cancel = new wxButton(this, wxID_CANCEL, _("Cancel"));
-       buttonSizer->AddSizerChild(cancel);
-  }
+    topsizer->SetSizeHints( this );
+    topsizer->Fit( this );

 
 

-  if (ok)
-    ok->SetDefault();
+    Centre( wxBOTH );

 
 

-  Layout();
-  Centre(wxBOTH);
+    m_textctrl->SetFocus();

 
 

-  wxEndBusyCursor();
+    wxEndBusyCursor();

 }
 
 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);
-}
-
-wxString wxGetTextFromUser(const wxString& message, const wxString& caption,
-                        const wxString& defaultValue, wxWindow *parent,
-                        int x, int y, bool WXUNUSED(centre) )
-{
-    wxTextEntryDialog dialog(parent, message, caption, defaultValue, wxOK|wxCANCEL, wxPoint(x, y));
-    if (dialog.ShowModal() == wxID_OK)
-        return dialog.GetValue();
-    else
-        return wxString("");
+    EndModal(wxID_OK);

 }
 }