From d7260478196b59ffd83c3328f710ba6f45860428 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 23 May 2003 18:59:07 +0000 Subject: [PATCH] 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 --- docs/publicity/slogans.txt | 13 +++++++++++++ docs/todo30.txt | 5 +++++ include/wx/dialog.h | 4 ++-- include/wx/generic/textdlgg.h | 3 +++ include/wx/valtext.h | 4 ++-- src/common/dlgcmn.cpp | 4 ++-- src/common/valgen.cpp | 11 +++++++++-- src/common/valtext.cpp | 4 ++-- src/generic/mdig.cpp | 2 ++ src/generic/msgdlgg.cpp | 6 ++++++ src/generic/splitter.cpp | 2 ++ src/generic/statline.cpp | 4 ++++ 12 files changed, 52 insertions(+), 10 deletions(-) diff --git a/docs/publicity/slogans.txt b/docs/publicity/slogans.txt index a56e094fca..3e4ab7d1bc 100644 --- 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 ) + +============================ diff --git a/docs/todo30.txt b/docs/todo30.txt index 8fb069a73f..12e9ad0675 100644 --- 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 319e891aec..f13cc11a5f 100644 --- 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 d6f29e986c..a5d0000d47 100644 --- 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 42b08aa0bf..06a235ae54 100644 --- 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 5a83e46889..715b81920a 100644 --- 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 6b8e98e061..f5c7a37a0e 100644 --- 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 ae69ecced5..530772a890 100644 --- 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 @@ -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 e10465b6fe..7919782ea5 100644 --- 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 fa5ae065f8..19e4307b25 100644 --- 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 1e51050540..f9860b7875 100644 --- 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 27437f2e6a..122af46799 100644 --- 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 -- 2.45.2