Compilation fix for old OS/2 compilers.

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

diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp
index 961a20a63fa71217184d5a833b44278217398dbf..32dbecd26ef4d9bca35fd6d1238cc7945709ed36 100644 (file)
--- a/src/generic/textdlgg.cpp
+++ b/src/generic/textdlgg.cpp
@@ -57,7 +57,7 @@ static const int wxID_TEXT = 3000;
 // ---------------------------------------------------------------------------
 
 /* Macro for avoiding #ifdefs when value have to be different depending on size of
 // ---------------------------------------------------------------------------
 
 /* Macro for avoiding #ifdefs when value have to be different depending on size of

-   device we display on
+   device we display on - take it from something like wxDesktopPolicy in the future

  */
 
 #if defined(__SMARTPHONE__)
  */
 
 #if defined(__SMARTPHONE__)


@@ -97,8 +97,10 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 

+#if wxUSE_STATTEXT

     // 1) text message
     topsizer->Add( CreateTextSizer( message ), 0, wxALL, wxLARGESMALL(10,0) );
     // 1) text message
     topsizer->Add( CreateTextSizer( message ), 0, wxALL, wxLARGESMALL(10,0) );

+#endif        

 
     // 2) text ctrl
     m_textctrl = new wxTextCtrl(this, wxID_TEXT, value,
 
     // 2) text ctrl
     m_textctrl = new wxTextCtrl(this, wxID_TEXT, value,


@@ -112,6 +114,7 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
 #endif
   // wxUSE_VALIDATORS
 
 #endif
   // wxUSE_VALIDATORS
 

+    // smart phones does not support or do not waste space for wxButtons

 #ifdef __SMARTPHONE__
 
     SetRightMenu(wxID_CANCEL, _("Cancel"));
 #ifdef __SMARTPHONE__
 
     SetRightMenu(wxID_CANCEL, _("Cancel"));


@@ -124,7 +127,7 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
 #endif
 
     // 4) buttons
 #endif
 
     // 4) buttons

-    topsizer->Add( CreateButtonSizer( style ), 0, wxCENTRE | wxALL, 10 );
+    topsizer->Add( CreateButtonSizer( style ), 0, wxEXPAND | wxALL, 10 );

 
 #endif // !__SMARTPHONE__
 
 
 #endif // !__SMARTPHONE__
 


@@ -134,7 +137,7 @@ wxTextEntryDialog::wxTextEntryDialog(wxWindow *parent,
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 

-    if ( ( style & wxCENTRE ) == wxCENTRE )
+    if ( style & wxCENTRE )

         Centre( wxBOTH );
 
     m_textctrl->SetSelection(-1, -1);
         Centre( wxBOTH );
 
     m_textctrl->SetSelection(-1, -1);


@@ -180,4 +183,22 @@ void wxTextEntryDialog::SetTextValidator( wxTextValidator& validator )
 #endif
   // wxUSE_VALIDATORS
 
 #endif
   // wxUSE_VALIDATORS
 

+// ----------------------------------------------------------------------------
+// wxPasswordEntryDialog
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_CLASS(wxPasswordEntryDialog, wxTextEntryDialog)
+
+wxPasswordEntryDialog::wxPasswordEntryDialog(wxWindow *parent,
+                                     const wxString& message,
+                                     const wxString& caption,
+                                     const wxString& value,
+                                     long style,
+                                     const wxPoint& pos)
+                 : wxTextEntryDialog(parent, message, caption, value,
+                                     style | wxTE_PASSWORD, pos)
+{
+    // Only change from wxTextEntryDialog is the password style
+}
+

 #endif // wxUSE_TEXTDLG
 #endif // wxUSE_TEXTDLG