merged 2.4 branch into the trunk

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions

View File

@@ -189,9 +189,6 @@ protected:
//
// Helper functions
//
void ChangePage( int nOldSel
,int nSel
); // change pages
int m_nSelection; // The current selection (-1 if none)

View File

@@ -398,5 +398,10 @@
#define wxUSE_PROTOCOL_FTP 1
#define wxUSE_PROTOCOL_FILE 1
#define wxUSE_GENERIC_MDI_AS_NATIVE 1
// use wxExpr (a.k.a. PrologIO)
#define wxUSE_PROLOGIO 1
#endif
// _WX_SETUP_H_

View File

@@ -30,6 +30,7 @@ public:
{
Create(pParent, vId, rsValue, rPos, rSize, lStyle, rValidator, rsName);
}
~wxTextCtrl();
bool Create( wxWindow* pParent
,wxWindowID vId
@@ -154,12 +155,16 @@ public:
void OnPaste(wxCommandEvent& rEvent);
void OnUndo(wxCommandEvent& rEvent);
void OnRedo(wxCommandEvent& rEvent);
void OnDelete(wxCommandEvent& rEvent);
void OnSelectAll(wxCommandEvent& rEvent);
void OnUpdateCut(wxUpdateUIEvent& rEvent);
void OnUpdateCopy(wxUpdateUIEvent& rEvent);
void OnUpdatePaste(wxUpdateUIEvent& rEvent);
void OnUpdateUndo(wxUpdateUIEvent& rEvent);
void OnUpdateRedo(wxUpdateUIEvent& rEvent);
void OnUpdateDelete(wxUpdateUIEvent& rEvent);
void OnUpdateSelectAll(wxUpdateUIEvent& rEvent);
inline bool IsMLE(void) {return m_bIsMLE;}
inline void SetMLE(bool bIsMLE) {m_bIsMLE = bIsMLE;}