restored mask copying code when converting a wxBitmap to a wxImage (wxMSW only)

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

diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp
index ea9700ee66d243bd8aa75796df45642138c50a0a..6e0ab1e48d48febdb7833076acb189d4d77ac26a 100644 (file)
--- a/src/generic/textdlgg.cpp
+++ b/src/generic/textdlgg.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "textdlgg.h"
 #endif
 
     #pragma implementation "textdlgg.h"
 #endif
 


@@ -28,15 +28,16 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-    #include <stdio.h>
+#if wxUSE_TEXTDLG

 
 

+#ifndef WX_PRECOMP

     #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/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
 #endif
 
 #if wxUSE_STATLINE


@@ -49,7 +50,7 @@
 // constants
 // ----------------------------------------------------------------------------
 
 // constants
 // ----------------------------------------------------------------------------
 

-#define wxID_TEXT 3000
+static const int wxID_TEXT = 3000;

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -59,13 +60,11 @@
 // wxTextEntryDialog
 // ----------------------------------------------------------------------------
 
 // wxTextEntryDialog
 // ----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY

 BEGIN_EVENT_TABLE(wxTextEntryDialog, wxDialog)
     EVT_BUTTON(wxID_OK, wxTextEntryDialog::OnOK)
 END_EVENT_TABLE()
 
 IMPLEMENT_CLASS(wxTextEntryDialog, wxDialog)
 BEGIN_EVENT_TABLE(wxTextEntryDialog, wxDialog)
     EVT_BUTTON(wxID_OK, wxTextEntryDialog::OnOK)
 END_EVENT_TABLE()
 
 IMPLEMENT_CLASS(wxTextEntryDialog, wxDialog)

-#endif

 
 wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
                                      const wxString& message,
 
 wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
                                      const wxString& message,


@@ -77,61 +76,85 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
                             wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL),
                    m_value(value)
 {
                             wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL),
                    m_value(value)
 {

-    // calculate the sizes
-    // -------------------
+    m_dialogStyle = style;
+    m_value = value;

 
 

-    wxArrayString lines;
-    wxSize sizeText = SplitTextMessage(message, &lines);
+    wxBeginBusyCursor();

 
 

-    wxSize sizeBtn = GetStandardButtonSize();
+    wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );

 
 

-    long wText = wxMax(4*sizeBtn.GetWidth(), sizeText.GetWidth());
-    long hText = GetStandardTextHeight();
+    // 1) text message
+    topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 );

 
 

-    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;
+    // 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 );

 
 

-    // create the controls
-    // -------------------
+#if wxUSE_VALIDATORS
+    wxTextValidator validator( wxFILTER_NONE, &m_value );
+    m_textctrl->SetValidator( validator );
+#endif
+  // wxUSE_VALIDATORS

 
 

-    // message
-    long x = 2*LAYOUT_X_MARGIN;
-    long y = CreateTextMessage(lines,
-                               wxPoint(x, 2*LAYOUT_Y_MARGIN),
-                               sizeText);
+#if wxUSE_STATLINE
+    // 3) static line
+    topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
+#endif

 
 

-    y += 2*LAYOUT_X_MARGIN;
+    // 4) buttons
+    topsizer->Add( CreateButtonSizer( style ), 0, wxCENTRE | wxALL, 10 );

 
 

-    // text ctrl
-    m_textctrl = new wxTextCtrl(this, wxID_TEXT, m_value,
-                                wxPoint(x, y),
-                                wxSize(wText, hText));
-    y += hText + 2*LAYOUT_X_MARGIN;
+    SetAutoLayout( TRUE );
+    SetSizer( topsizer );

 
 

-    // and buttons
-    CreateStandardButtons(wDialog, y, sizeBtn.GetWidth(), sizeBtn.GetHeight());
+    topsizer->SetSizeHints( this );
+    topsizer->Fit( this );

 
 

-    // set the dialog size and position
-    SetClientSize(wDialog, hDialog);
-    if ( pos == wxDefaultPosition )
-    {
-        // centre the dialog if no explicit position given
-        Centre(wxBOTH | wxCENTER_FRAME);
-    }
+    Centre( wxBOTH );

 
 

+    m_textctrl->SetSelection(-1, -1);

     m_textctrl->SetFocus();
     m_textctrl->SetFocus();

+
+    wxEndBusyCursor();

 }
 
 void wxTextEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event) )
 {
 }
 
 void wxTextEntryDialog::OnOK(wxCommandEvent& WXUNUSED(event) )
 {

+#if wxUSE_VALIDATORS
+    if( Validate() && TransferDataFromWindow() ) 
+    {
+        EndModal( wxID_OK );
+    }
+#else

     m_value = m_textctrl->GetValue();
 
     EndModal(wxID_OK);
     m_value = m_textctrl->GetValue();
 
     EndModal(wxID_OK);

+#endif
+  // wxUSE_VALIDATORS

 }
 
 }
 

+void wxTextEntryDialog::SetValue(const wxString& val)
+{
+    m_value = val;
+
+    m_textctrl->SetValue(val);
+}
+
+#if wxUSE_VALIDATORS
+void wxTextEntryDialog::SetTextValidator( long style )
+{
+    wxTextValidator validator( style, &m_value );
+    m_textctrl->SetValidator( validator );
+}
+
+void wxTextEntryDialog::SetTextValidator( wxTextValidator& validator )
+{
+    m_textctrl->SetValidator( validator );
+}
+
+#endif
+  // wxUSE_VALIDATORS
+
+#endif // wxUSE_TEXTDLG