Applied patch [ 738821 ] Allow more features to be turned off

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/publicity/slogans.txt b/docs/publicity/slogans.txt
index a56e094fca391b732fb1022bd3017a7014c29fac..3e4ab7d1bcac38c0454a888b0ab6d1e81ec67bec 100644 (file)
--- a/docs/publicity/slogans.txt
+++ b/docs/publicity/slogans.txt
@@ -72,6 +72,7 @@ maybe stripped down to
 
 "Specialization is for insects."
 
+============================
 The Open-Source, Cross-Platform GUI Framework 
   with Ten Years of Evolution Behind It
 
@@ -93,10 +94,22 @@ people would be bound to stop and ask what it was all about!
 .. and how about a nice silk tie (US: necktie) with the logo on ... 
 Oh, I forgot, we programmers don't wear ties.
 
+============================
 "I can't believe it's not native"
 
+============================
 "Because friends don't let friends use Win32".
 
 (or MFC)
 
+============================
+
+Have a photo of 3 babes wearing Linux, Windows and Mac Logo T-shirt with
+words at the bottom.
+
+"Why choose one when you can have 3?"
+
+(Mohammad Zubair <mzubair@singnet.com.sg>)
+
+============================
 

diff --git a/docs/todo30.txt b/docs/todo30.txt
index 8fb069a73f2868003442b2828df7b50e3ab38673..12e9ad0675563489710b3bbf5b2cfadb120106f0 100644 (file)
--- a/docs/todo30.txt
+++ b/docs/todo30.txt
@@ -205,5 +205,10 @@ wxMiscellaneous
 - Add individual setters to wxScrollBar and other classes
   that use a combined setter.
 - Remove traces of old resource system from wxWizard.
+- Have wxDirCtrl as alias for wxGenericDirCtrl.
+- Allow instant reaction to left-up in a wxGrid cell
+  (extend editor API) to work around bad checkbox
+  behaviour (click, click, click, click away...) and
+  reduce checkbox size on non-Windows platforms.
 
 Version:      $Id$

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index 319e891aec5f72599bb3888238ebf407229b9684..f13cc11a5fd6a5f30b1748147b5b6a2949273c58 100644 (file)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -35,11 +35,11 @@ public:
     void SetReturnCode(int returnCode) { m_returnCode = returnCode; }
     int GetReturnCode() const { return m_returnCode; }
 
-#if wxUSE_STATTEXT && wxUSE_TEXTCTRL
+#if wxUSE_STATTEXT // && wxUSE_TEXTCTRL
     // splits text up at newlines and places the
     // lines into a vertical wxBoxSizer
     wxSizer *CreateTextSizer( const wxString &message );
-#endif // wxUSE_STATTEXT && wxUSE_TEXTCTRL
+#endif // wxUSE_STATTEXT // && wxUSE_TEXTCTRL
 
 #if wxUSE_BUTTON
     // places buttons into a horizontal wxBoxSizer

diff --git a/include/wx/generic/textdlgg.h b/include/wx/generic/textdlgg.h
index d6f29e986c08e68d2c8f987ef74ade4ca3e533c6..a5d0000d47ca992b85aa5e6caba1b11297731266 100644 (file)
--- a/include/wx/generic/textdlgg.h
+++ b/include/wx/generic/textdlgg.h
@@ -16,6 +16,7 @@
     #pragma interface "textdlgg.h"
 #endif
 
+#if wxUSE_TEXTDLG
 #include "wx/defs.h"
 
 #include "wx/dialog.h"
@@ -88,5 +89,7 @@ wxGetPasswordFromUser(const wxString& message,
                       const wxString& default_value = wxEmptyString,
                       wxWindow *parent = (wxWindow *) NULL);
 
+#endif
+    // wxUSE_TEXTDLG
 #endif
     // __TEXTDLGH_G__

diff --git a/include/wx/valtext.h b/include/wx/valtext.h
index 42b08aa0bfd05a18c745461db2ff85031649970f..06a235ae54c3e2da79674bafdfe6e4445182931e 100644 (file)
--- a/include/wx/valtext.h
+++ b/include/wx/valtext.h
@@ -18,7 +18,7 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_VALIDATORS
+#if wxUSE_VALIDATORS && wxUSE_TEXTCTRL
 
 #include "wx/textctrl.h"
 #include "wx/validate.h"
@@ -106,7 +106,7 @@ private:
 };
 
 #endif
-  // wxUSE_VALIDATORS
+  // wxUSE_VALIDATORS && wxUSE_TEXTCTRL
 
 #endif
   // _WX_VALTEXTH__

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index 5a83e468893edb2d7bd8dc486d15f7bbd69aac63..715b81920add9d6792a07a29df824b152de857aa 100644 (file)
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -67,7 +67,7 @@ void wxDialogBase::Init()
 #endif
 }
 
-#if wxUSE_STATTEXT && wxUSE_TEXTCTRL
+#if wxUSE_STATTEXT // && wxUSE_TEXTCTRL
 
 wxSizer *wxDialogBase::CreateTextSizer( const wxString& message )
 {
@@ -164,7 +164,7 @@ wxSizer *wxDialogBase::CreateTextSizer( const wxString& message )
     return box;
 }
 
-#endif // wxUSE_STATTEXT && wxUSE_TEXTCTRL
+#endif // wxUSE_STATTEXT // && wxUSE_TEXTCTRL
 
 #if wxUSE_BUTTON
 

diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp
index 6b8e98e061529cc915b8690576f0fd45008dd160..f5c7a37a0e9e13b4556ed49d51a31173e60bdf7e 100644 (file)
--- a/src/common/valgen.cpp
+++ b/src/common/valgen.cpp
@@ -203,6 +203,7 @@ bool wxGenericValidator::TransferToWindow(void)
 #endif
 
     // string controls
+#if wxUSE_BUTTON
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )
     {
         wxButton* pControl = (wxButton*) m_validatorWindow;
@@ -212,6 +213,7 @@ bool wxGenericValidator::TransferToWindow(void)
             return TRUE;
         }
     } else
+#endif
 #if wxUSE_COMBOBOX
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
     {
@@ -263,6 +265,7 @@ bool wxGenericValidator::TransferToWindow(void)
             return TRUE;
         }
     } else
+#if wxUSE_TEXTCTRL
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
     {
         wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
@@ -279,6 +282,7 @@ bool wxGenericValidator::TransferToWindow(void)
             return TRUE;
         }
     } else
+#endif
     // array controls
 #if wxUSE_CHECKLISTBOX && !defined(__WIN16__)
     // NOTE: wxCheckListBox is a wxListBox, so wxCheckListBox MUST come first:
@@ -428,6 +432,7 @@ bool wxGenericValidator::TransferFromWindow(void)
   } else
 #endif
   // string controls
+#if wxUSE_BUTTON
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )
   {
     wxButton* pControl = (wxButton*) m_validatorWindow;
@@ -436,8 +441,8 @@ bool wxGenericValidator::TransferFromWindow(void)
       *m_pString = pControl->GetLabel() ;
       return TRUE;
     }
-  }
-  else
+  } else
+#endif
 #if wxUSE_COMBOBOX
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
   {
@@ -479,6 +484,7 @@ bool wxGenericValidator::TransferFromWindow(void)
       return TRUE;
     }
   } else
+#if wxUSE_TEXTCTRL
   if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
   {
     wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
@@ -493,6 +499,7 @@ bool wxGenericValidator::TransferFromWindow(void)
         return TRUE;
     }
   } else
+#endif
   // array controls
 #if wxUSE_CHECKLISTBOX
 #ifndef __WIN16__

diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp
index ae69ecced59da689f3587efe382ba3078400e449..530772a890fc3d967eda09a4323f582863576678 100644 (file)
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -20,7 +20,7 @@
   #pragma hdrstop
 #endif
 
-#if wxUSE_VALIDATORS
+#if wxUSE_VALIDATORS && wxUSE_TEXTCTRL
 
 #ifndef WX_PRECOMP
   #include <stdio.h>
@@ -332,4 +332,4 @@ bool wxTextValidator::IsNotInCharExcludeList(const wxString& val)
 }
 
 #endif
-  // wxUSE_VALIDATORS
+  // wxUSE_VALIDATORS && wxUSE_TEXTCTRL

diff --git a/src/generic/mdig.cpp b/src/generic/mdig.cpp
index e10465b6fed93f66dc0b9d22b257e9161545784b..7919782ea51df15fecb84f009b7497c07dc48b87 100644 (file)
--- a/src/generic/mdig.cpp
+++ b/src/generic/mdig.cpp
@@ -51,7 +51,9 @@ enum MDI_MENU_ID
 IMPLEMENT_DYNAMIC_CLASS(wxGenericMDIParentFrame, wxFrame)
 
 BEGIN_EVENT_TABLE(wxGenericMDIParentFrame, wxFrame)
+#if wxUSE_MENUS
     EVT_MENU (-1, wxGenericMDIParentFrame::DoHandleMenu)
+#endif
 END_EVENT_TABLE()
 
 wxGenericMDIParentFrame::wxGenericMDIParentFrame()

diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp
index fa5ae065f8d5949bb76b40083e4674b7210a8f74..19e4307b25a9995ba10165805cc5160c4a611248 100644 (file)
--- a/src/generic/msgdlgg.cpp
+++ b/src/generic/msgdlgg.cpp
@@ -99,15 +99,19 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent,
                 bitmap = wxArtProvider::GetIcon(wxART_QUESTION, wxART_MESSAGE_BOX);
                 break;
         }
+#if wxUSE_STATIC_BITMAP
         wxStaticBitmap *icon = new wxStaticBitmap(this, -1, bitmap);
         if (is_pda)
             topsizer->Add( icon, 0, wxTOP|wxLEFT|wxRIGHT | wxALIGN_LEFT, 10 );
         else
             icon_text->Add( icon, 0, wxCENTER );
+#endif
     }
 
     // 2) text
+#if wxUSE_STATTEXT // && wxUSE_TEXTCTRL
     icon_text->Add( CreateTextSizer( message ), 0, wxCENTER | wxLEFT, 10 );
+#endif
 
     topsizer->Add( icon_text, 1, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
 
@@ -117,7 +121,9 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent,
 #endif
 
     // 4) buttons
+#if wxUSE_BUTTON
     topsizer->Add( CreateButtonSizer( style ), 0, wxCENTRE | wxALL, 10 );
+ #endif
 
     SetAutoLayout( TRUE );
     SetSizer( topsizer );

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 1e51050540b8eeac14b402d965dd228041496660..f9860b78752ac55e6330d8058b056592d1ce8879 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -16,6 +16,7 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_SPLITTER
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
@@ -1093,5 +1094,6 @@ void wxSplitterWindow::OnSetCursor(wxSetCursorEvent& event)
     //else: do nothing, in particular, don't call Skip()
 }
 
+#endif // wxUSE_SPLITTER
 #endif // wxMSW
 

diff --git a/src/generic/statline.cpp b/src/generic/statline.cpp
index 27437f2e6ae25df4dc1116911a3a184736e1edcb..122af4679991e6941c9b1a71a58af31dcbf771c3 100644 (file)
--- a/src/generic/statline.cpp
+++ b/src/generic/statline.cpp
@@ -20,6 +20,7 @@
     #pragma implementation "statline.h"
 #endif
 
+#if wxUSE_STATLINE
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -75,3 +76,6 @@ void wxStaticLine::DoMoveWindow(int x, int y, int width, int height)
 {
     m_statbox->SetSize(x, y, width, height);
 }
+
+#endif
+  // wxUSE_STATLINE