Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deprecated and obsolete parts marked up for backward compatibility.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-04-14 17:01:16 +00:00
parent 006591def7
commit 40ff126ac4
35 changed files with 167 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/src/deprecated/resource.cpp
View File

@@ -2105,7 +2105,9 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
{ wxT("wxCB_SORT"), wxCB_SORT },
/* wxGauge */
#if WXWIN_COMPATIBILITY_2_6
{ wxT("wxGA_PROGRESSBAR"), wxGA_PROGRESSBAR },
#endif // WXWIN_COMPATIBILITY_2_6
{ wxT("wxGA_HORIZONTAL"), wxGA_HORIZONTAL },
{ wxT("wxGA_VERTICAL"), wxGA_VERTICAL },

6
contrib/utils/convertrc/wxr2xml.cpp
View File

@@ -1,7 +1,7 @@
// wxr2xml.cpp: implementation of the wxr2xml class.
// 8/30/00 Brian Gavin
// only tested on wxMSW so far
//License: wxWindows Liscense
// License: wxWindows Liscense
// ////////////////////////////////////////////////////////////////////
/*
@@ -31,12 +31,10 @@ trans->Convert("Myfile.wxr","Myfile.xml");
wxr2xml::wxr2xml()
{
}
wxr2xml::~wxr2xml()
{
}
bool wxr2xml::Convert(wxString wxrfile, wxString xmlfile)
@@ -466,8 +464,6 @@ wxString wxr2xml::GetStyles(wxItemResource * res)
s += _T("wxGA_HORIZONTAL|");
if (style & wxGA_VERTICAL)
s += _T("wxGA_VERTICAL|");
if (style & wxGA_PROGRESSBAR)
s += _T("wxGA_PROGRESSBAR|");
// windows only
if (style & wxGA_SMOOTH)
s += _T("wxGA_SMOOTH|");

9
include/wx/app.h
View File

@@ -503,10 +503,12 @@ public:
// deactivated
virtual void SetActive(bool isActive, wxWindow *lastFocus);
#if WXWIN_COMPATIBILITY_2_6
// OBSOLETE: don't use, always returns true
//
// returns true if the program is successfully initialized
bool Initialized() { return true; }
wxDEPRECATED( bool Initialized() );
#endif // WXWIN_COMPATIBILITY_2_6
// perform standard OnIdle behaviour, ensure that this is always called
void OnIdle(wxIdleEvent& event);
@@ -549,6 +551,10 @@ protected:
DECLARE_NO_COPY_CLASS(wxAppBase)
};
#if WXWIN_COMPATIBILITY_2_6
inline bool wxAppBase::Initialized() { return true; }
#endif // WXWIN_COMPATIBILITY_2_6
#endif // wxUSE_GUI
// ----------------------------------------------------------------------------
@@ -694,4 +700,3 @@ extern wxAppConsole *wxCreateApp();
extern wxAppInitializer wxTheAppInitializer;
#endif // _WX_APP_H_BASE_

6
include/wx/gauge.h
View File

@@ -28,8 +28,10 @@
// Win32 only, is default (and only) on some other platforms
#define wxGA_SMOOTH 0x0020
// obsolete style
#define wxGA_PROGRESSBAR 0
#if WXWIN_COMPATIBILITY_2_6
// obsolete style
#define wxGA_PROGRESSBAR 0
#endif // WXWIN_COMPATIBILITY_2_6
extern WXDLLEXPORT_DATA(const wxChar) wxGaugeNameStr[];

11
include/wx/listbox.h
View File

@@ -103,12 +103,14 @@ public:
// event.GetExtraLong())
void Command(wxCommandEvent& event);
#if WXWIN_COMPATIBILITY_2_6
// compatibility - these functions are deprecated, use the new ones
// instead
bool Selected(int n) const { return IsSelected(n); }
wxDEPRECATED( bool Selected(int n) const );
// returns the item number at a point or wxNOT_FOUND
int HitTest(const wxPoint& point) const { return DoListHitTest(point); }
wxDEPRECATED( int HitTest(const wxPoint& point) const );
#endif // WXWIN_COMPATIBILITY_2_6
protected:
// NB: due to wxGTK implementation details, DoInsert() is implemented
@@ -132,6 +134,11 @@ protected:
DECLARE_NO_COPY_CLASS(wxListBoxBase)
};
#if WXWIN_COMPATIBILITY_2_6
inline bool wxListBoxBase::Selected(int n) const { return IsSelected(n); }
inline int wxListBoxBase::HitTest(const wxPoint& point) const { return DoListHitTest(point); }
#endif // WXWIN_COMPATIBILITY_2_6
// ----------------------------------------------------------------------------
// include the platform-specific class declaration
// ----------------------------------------------------------------------------

14
include/wx/mstream.h
View File

@@ -33,8 +33,10 @@ public:
wxStreamBuffer *GetInputStreamBuffer() const { return m_i_streambuf; }
#if WXWIN_COMPATIBILITY_2_6
// deprecated, compatibility only
wxStreamBuffer *InputStreamBuffer() const { return m_i_streambuf; }
wxDEPRECATED( wxStreamBuffer *InputStreamBuffer() const );
#endif // WXWIN_COMPATIBILITY_2_6
protected:
wxStreamBuffer *m_i_streambuf;
@@ -62,8 +64,10 @@ public:
wxStreamBuffer *GetOutputStreamBuffer() const { return m_o_streambuf; }
#if WXWIN_COMPATIBILITY_2_6
// deprecated, compatibility only
wxStreamBuffer *OutputStreamBuffer() const { return m_o_streambuf; }
wxDEPRECATED( wxStreamBuffer *OutputStreamBuffer() const );
#endif // WXWIN_COMPATIBILITY_2_6
protected:
wxStreamBuffer *m_o_streambuf;
@@ -76,9 +80,13 @@ protected:
DECLARE_NO_COPY_CLASS(wxMemoryOutputStream)
};
#if WXWIN_COMPATIBILITY_2_6
inline wxStreamBuffer *wxMemoryInputStream::InputStreamBuffer() const { return m_i_streambuf; }
inline wxStreamBuffer *wxMemoryOutputStream::OutputStreamBuffer() const { return m_o_streambuf; }
#endif // WXWIN_COMPATIBILITY_2_6
#endif
// wxUSE_STREAMS
#endif
// _WX_WXMMSTREAM_H__

5
include/wx/msw/dialog.h
View File

@@ -108,9 +108,7 @@ public:
// Windows callbacks
WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
// obsolete methods
// ----------------
#if WXWIN_COMPATIBILITY_2_6
// use the other ctor
wxDEPRECATED( wxDialog(wxWindow *parent,
const wxString& title, bool modal,
@@ -123,6 +121,7 @@ public:
// use IsModal()
wxDEPRECATED( bool IsModalShowing() const );
#endif // WXWIN_COMPATIBILITY_2_6
// handle Escape here
virtual bool MSWProcessMessage(WXMSG* pMsg);

3
include/wx/msw/listctrl.h
View File

@@ -363,8 +363,10 @@ public:
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
#if WXWIN_COMPATIBILITY_2_6
// obsolete stuff, for compatibility only -- don't use
wxDEPRECATED( int GetItemSpacing(bool isSmall) const);
#endif // WXWIN_COMPATIBILITY_2_6
// convert our styles to Windows
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
@@ -435,4 +437,3 @@ private:
#endif // wxUSE_LISTCTRL
#endif // _WX_LISTCTRL_H_

8
include/wx/os2/dialog.h
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: dialog.h
// Name: wx/os2/dialog.h
// Purpose: wxDialog class
// Author: David Webster
// Modified by:
@@ -90,8 +90,7 @@ public:
,WXWPARAM wParam
,WXLPARAM lParam
);
// obsolete methods
// ----------------
#if WXWIN_COMPATIBILITY_2_6
// Constructor with a modal flag, but no window id - the old convention
wxDEPRECATED( wxDialog( wxWindow* pParent
@@ -111,6 +110,8 @@ public:
// use IsModal()
wxDEPRECATED( bool IsModalShowing() const );
#endif // WXWIN_COMPATIBILITY_2_6
protected:
//
// find the window to use as parent for this dialog if none has been
@@ -147,4 +148,3 @@ private:
}; // end of CLASS wxDialog
#endif // _WX_DIALOG_H_

7
include/wx/slider.h
View File

@@ -40,9 +40,10 @@
#define wxSL_SELRANGE 0x0800
#define wxSL_INVERSE 0x1000
// obsolete
#define wxSL_NOTIFY_DRAG 0x0000
#if WXWIN_COMPATIBILITY_2_6
// obsolete
#define wxSL_NOTIFY_DRAG 0x0000
#endif // WXWIN_COMPATIBILITY_2_6
extern WXDLLEXPORT_DATA(const wxChar) wxSliderNameStr[];

8
include/wx/splitter.h
View File

@@ -28,9 +28,11 @@
#define wxSP_BORDER wxSP_3DBORDER
#define wxSP_3D (wxSP_3DBORDER | wxSP_3DSASH)
// obsolete styles, don't do anything
#define wxSP_SASH_AQUA 0
#define wxSP_FULLSASH 0
#if WXWIN_COMPATIBILITY_2_6
// obsolete styles, don't do anything
#define wxSP_SASH_AQUA 0
#define wxSP_FULLSASH 0
#endif // WXWIN_COMPATIBILITY_2_6
BEGIN_DECLARE_EVENT_TYPES()
DECLARE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, 850)

17
include/wx/stopwatch.h
View File

@@ -66,17 +66,17 @@ private:
#endif // wxUSE_STOPWATCH
#if wxUSE_LONGLONG
#if wxUSE_LONGLONG && WXWIN_COMPATIBILITY_2_6
// Starts a global timer
// -- DEPRECATED: use wxStopWatch instead
void WXDLLIMPEXP_BASE wxStartTimer();
// Starts a global timer
// -- DEPRECATED: use wxStopWatch instead
wxDEPRECATED( void WXDLLIMPEXP_BASE wxStartTimer() );
// Gets elapsed milliseconds since last wxStartTimer or wxGetElapsedTime
// -- DEPRECATED: use wxStopWatch instead
long WXDLLIMPEXP_BASE wxGetElapsedTime(bool resetTimer = true);
// Gets elapsed milliseconds since last wxStartTimer or wxGetElapsedTime
// -- DEPRECATED: use wxStopWatch instead
wxDEPRECATED( long WXDLLIMPEXP_BASE wxGetElapsedTime(bool resetTimer = true) );
#endif // wxUSE_LONGLONG
#endif // wxUSE_LONGLONG && WXWIN_COMPATIBILITY_2_6
// ----------------------------------------------------------------------------
// global time functions
@@ -100,4 +100,3 @@ extern wxMilliClock_t WXDLLIMPEXP_BASE wxGetLocalTimeMillis();
#define wxGetCurrentTime() wxGetLocalTime()
#endif // _WX_STOPWATCH_H_

19
include/wx/stream.h
View File

@@ -388,8 +388,10 @@ public:
wxInputStream *GetInputStream() const;
wxOutputStream *GetOutputStream() const;
#if WXWIN_COMPATIBILITY_2_6
// deprecated, for compatibility only
wxStreamBase *Stream() { return m_stream; }
wxDEPRECATED( wxStreamBase *Stream() );
#endif // WXWIN_COMPATIBILITY_2_6
// this constructs a dummy wxStreamBuffer, used by (and exists for)
// wxMemoryStreams only, don't use!
@@ -465,8 +467,10 @@ public:
void SetInputStreamBuffer(wxStreamBuffer *buffer);
wxStreamBuffer *GetInputStreamBuffer() const { return m_i_streambuf; }
#if WXWIN_COMPATIBILITY_2_6
// deprecated, for compatibility only
wxStreamBuffer *InputStreamBuffer() const { return m_i_streambuf; }
wxDEPRECATED( wxStreamBuffer *InputStreamBuffer() const );
#endif // WXWIN_COMPATIBILITY_2_6
protected:
virtual size_t OnSysRead(void *buffer, size_t bufsize);
@@ -506,8 +510,10 @@ public:
void SetOutputStreamBuffer(wxStreamBuffer *buffer);
wxStreamBuffer *GetOutputStreamBuffer() const { return m_o_streambuf; }
#if WXWIN_COMPATIBILITY_2_6
// deprecated, for compatibility only
wxStreamBuffer *OutputStreamBuffer() const { return m_o_streambuf; }
wxDEPRECATED( wxStreamBuffer *OutputStreamBuffer() const );
#endif // WXWIN_COMPATIBILITY_2_6
protected:
virtual size_t OnSysWrite(const void *buffer, size_t bufsize);
@@ -519,7 +525,12 @@ protected:
DECLARE_NO_COPY_CLASS(wxBufferedOutputStream)
};
#if WXWIN_COMPATIBILITY_2_6
inline wxStreamBase *wxStreamBuffer::Stream() { return m_stream; }
inline wxStreamBuffer *wxBufferedInputStream::InputStreamBuffer() const { return m_i_streambuf; }
inline wxStreamBuffer *wxBufferedOutputStream::OutputStreamBuffer() const { return m_o_streambuf; }
#endif // WXWIN_COMPATIBILITY_2_6
#endif // wxUSE_STREAMS
#endif // _WX_WXSTREAM_H__

8
include/wx/textctrl.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
// Name: textctrl.h
// Name: wx/textctrl.h
// Purpose: wxTextCtrlBase class - the interface of wxTextCtrl
// Author: Vadim Zeitlin
// Modified by:
@@ -116,8 +116,10 @@ const wxTextCoord wxInvalidTextCoord = -2;
#define wxTE_WORDWRAP 0x0001 // wrap only at words boundaries
#define wxTE_BESTWRAP 0x0000 // this is the default
// obsolete synonym
#define wxTE_LINEWRAP wxTE_CHARWRAP
#if WXWIN_COMPATIBILITY_2_6
// obsolete synonym
#define wxTE_LINEWRAP wxTE_CHARWRAP
#endif // WXWIN_COMPATIBILITY_2_6
// force using RichEdit version 2.0 or 3.0 instead of 1.0 (default) for
// wxTE_RICH controls - can be used together with or instead of wxTE_RICH

10
include/wx/thread.h
View File

@@ -349,9 +349,10 @@ public:
wxCondError Broadcast();
#if WXWIN_COMPATIBILITY_2_6
// deprecated version, don't use
bool Wait(unsigned long milliseconds)
{ return WaitTimeout(milliseconds) == wxCOND_NO_ERROR; }
wxDEPRECATED( bool Wait(unsigned long milliseconds) );
#endif // WXWIN_COMPATIBILITY_2_6
private:
wxConditionInternal *m_internal;
@@ -359,6 +360,11 @@ private:
DECLARE_NO_COPY_CLASS(wxCondition)
};
#if WXWIN_COMPATIBILITY_2_6
inline bool wxCondition::Wait(unsigned long milliseconds)
{ return WaitTimeout(milliseconds) == wxCOND_NO_ERROR; }
#endif // WXWIN_COMPATIBILITY_2_6
// ----------------------------------------------------------------------------
// wxSemaphore: a counter limiting the number of threads concurrently accessing
// a shared resource

9
include/wx/treebase.h
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: treebase.h
// Name: wx/treebase.h
// Purpose: wxTreeCtrl base classes and types
// Author: Julian Smart et al
// Modified by:
@@ -24,6 +24,8 @@
#include "wx/event.h"
#include "wx/dynarray.h"
#if WXWIN_COMPATIBILITY_2_6
// flags for deprecated `Expand(int action)', will be removed in next versions
enum
{
@@ -33,6 +35,8 @@ enum
wxTREE_EXPAND_TOGGLE
};
#endif // WXWIN_COMPATIBILITY_2_6
// ----------------------------------------------------------------------------
// wxTreeItemId identifies an element of the tree. In this implementation, it's
// just a trivial wrapper around Win32 HTREEITEM or a pointer to some private
@@ -179,9 +183,11 @@ enum wxTreeItemIcon
#define wxTR_DEFAULT_STYLE (wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT)
#endif
#if WXWIN_COMPATIBILITY_2_6
// deprecated, don't use
#define wxTR_MAC_BUTTONS 0
#define wxTR_AQUA_BUTTONS 0
#endif // WXWIN_COMPATIBILITY_2_6
// values for the `flags' parameter of wxTreeCtrl::HitTest() which determine
@@ -413,4 +419,3 @@ END_DECLARE_EVENT_TYPES()
#endif // wxUSE_TREECTRL
#endif // _WX_TREEBASE_H_

7
include/wx/txtstrm.h
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: txtstrm.h
// Name: wx/txtstrm.h
// Purpose: Text stream classes
// Author: Guilhem Lavaux
// Modified by:
@@ -52,7 +52,6 @@ public:
wxInt16 Read16S(int base = 10);
wxInt8 Read8S(int base = 10);
double ReadDouble();
wxString ReadString(); // deprecated: use ReadLine or ReadWord instead
wxString ReadLine();
wxString ReadWord();
wxChar GetChar() { wxChar c = NextChar(); return (wxChar)(c != wxEOT ? c : 0); }
@@ -75,6 +74,10 @@ public:
wxTextInputStream& operator>>( __wxTextInputManip func) { return func(*this); }
#if WXWIN_COMPATIBILITY_2_6
wxDEPRECATED( wxString ReadString() ); // use ReadLine or ReadWord instead
#endif // WXWIN_COMPATIBILITY_2_6
protected:
wxInputStream &m_input;
wxString m_separators;

7
include/wx/window.h
View File

@@ -1448,8 +1448,11 @@ extern WXDLLEXPORT wxWindow *wxGetActiveWindow();
// get the (first) top level parent window
WXDLLEXPORT wxWindow* wxGetTopLevelParent(wxWindow *win);
// deprecated (doesn't start with 'wx' prefix), use wxWindow::NewControlId()
inline int NewControlId() { return wxWindowBase::NewControlId(); }
#if WXWIN_COMPATIBILITY_2_6
// deprecated (doesn't start with 'wx' prefix), use wxWindow::NewControlId()
wxDEPRECATED( int NewControlId() );
inline int NewControlId() { return wxWindowBase::NewControlId(); }
#endif // WXWIN_COMPATIBILITY_2_6
#if wxUSE_ACCESSIBILITY
// ----------------------------------------------------------------------------

2
samples/widgets/textctrl.cpp
View File

@@ -633,7 +633,7 @@ void TextWidgetsPage::CreateText()
break;
case WrapStyle_Char:
flags |= wxTE_LINEWRAP;
flags |= wxTE_CHARWRAP;
break;
case WrapStyle_Best:

6
src/common/txtstrm.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
// Name: txtstrm.cpp
// Name: src/common/txtstrm.cpp
// Purpose: Text stream classes
// Author: Guilhem Lavaux
// Modified by:
@@ -178,11 +178,15 @@ double wxTextInputStream::ReadDouble()
return wxStrtod(word.c_str(), 0);
}
#if WXWIN_COMPATIBILITY_2_6
wxString wxTextInputStream::ReadString()
{
return ReadLine();
}
#endif // WXWIN_COMPATIBILITY_2_6
wxString wxTextInputStream::ReadLine()
{
wxString line;

27
src/common/valgen.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: valgen.cpp
// Name: src/common/valgen.cpp
// Purpose: wxGenericValidator class
// Author: Kevin Smith
// Modified by:
@@ -131,11 +131,11 @@ bool wxGenericValidator::TransferToWindow(void)
if (m_validatorWindow->IsKindOf(CLASSINFO(wxToggleButton)) )
{
wxToggleButton * pControl = (wxToggleButton *) m_validatorWindow;
if (m_pBool)
{
pControl->SetValue(*m_pBool);
return true;
}
if (m_pBool)
{
pControl->SetValue(*m_pBool);
return true;
}
} else
#endif
@@ -375,12 +375,12 @@ bool wxGenericValidator::TransferFromWindow(void)
#if wxUSE_TOGGLEBTN
if (m_validatorWindow->IsKindOf(CLASSINFO(wxToggleButton)) )
{
wxToggleButton *pControl = (wxToggleButton *) m_validatorWindow;
if (m_pBool)
{
*m_pBool = pControl->GetValue() ;
return true;
}
wxToggleButton *pControl = (wxToggleButton *) m_validatorWindow;
if (m_pBool)
{
*m_pBool = pControl->GetValue() ;
return true;
}
} else
#endif
@@ -567,7 +567,7 @@ bool wxGenericValidator::TransferFromWindow(void)
count = pControl->GetCount();
for ( i = 0; i < count; i++ )
{
if (pControl->Selected(i))
if (pControl->IsSelected(i))
m_pArrayInt->Add(i);
}
@@ -595,4 +595,3 @@ void wxGenericValidator::Initialize()
#endif
// wxUSE_VALIDATORS

2
src/common/variant.cpp
View File

@@ -797,7 +797,7 @@ bool wxVariantDataString::Read(wxInputStream& str)
{
wxTextInputStream s(str);
m_value = s.ReadString();
m_value = s.ReadLine();
return true;
}
#endif // wxUSE_STREAMS

8
src/msw/dialog.cpp
View File

@@ -200,6 +200,8 @@ bool wxDialog::Create(wxWindow *parent,
return true;
}
#if WXWIN_COMPATIBILITY_2_6
// deprecated ctor
wxDialog::wxDialog(wxWindow *parent,
const wxString& title,
@@ -221,6 +223,8 @@ void wxDialog::SetModal(bool WXUNUSED(flag))
// nothing to do, obsolete method
}
#endif // WXWIN_COMPATIBILITY_2_6
wxDialog::~wxDialog()
{
m_isBeingDeleted = true;
@@ -233,11 +237,15 @@ wxDialog::~wxDialog()
// showing the dialogs
// ----------------------------------------------------------------------------
#if WXWIN_COMPATIBILITY_2_6
bool wxDialog::IsModalShowing() const
{
return IsModal();
}
#endif // WXWIN_COMPATIBILITY_2_6
wxWindow *wxDialog::FindSuitableParent() const
{
// first try to use the currently active window

3
src/msw/gauge95.cpp
View File

@@ -95,7 +95,9 @@ wxBEGIN_FLAGS( wxGaugeStyle )
wxFLAGS_MEMBER(wxGA_HORIZONTAL)
wxFLAGS_MEMBER(wxGA_VERTICAL)
#if WXWIN_COMPATIBILITY_2_6
wxFLAGS_MEMBER(wxGA_PROGRESSBAR)
#endif // WXWIN_COMPATIBILITY_2_6
wxFLAGS_MEMBER(wxGA_SMOOTH)
wxEND_FLAGS( wxGaugeStyle )
@@ -217,4 +219,3 @@ bool wxGauge95::SetBackgroundColour(const wxColour& col)
}
#endif // wxUSE_GAUGE

4
src/msw/listctrl.cpp
View File

@@ -1063,11 +1063,15 @@ wxSize wxListCtrl::GetItemSpacing() const
return wxSize(LOWORD(spacing), HIWORD(spacing));
}
#if WXWIN_COMPATIBILITY_2_6
int wxListCtrl::GetItemSpacing(bool isSmall) const
{
return ListView_GetItemSpacing(GetHwnd(), (BOOL) isSmall);
}
#endif // WXWIN_COMPATIBILITY_2_6
void wxListCtrl::SetItemTextColour( long item, const wxColour &col )
{
wxListItem info;

4
src/msw/textctrl.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: msw/textctrl.cpp
// Name: src/msw/textctrl.cpp
// Purpose: wxTextCtrl
// Author: Julian Smart
// Modified by:
@@ -206,7 +206,7 @@ wxBEGIN_FLAGS( wxTextCtrlStyle )
wxFLAGS_MEMBER(wxTE_CENTRE)
wxFLAGS_MEMBER(wxTE_RIGHT)
wxFLAGS_MEMBER(wxTE_DONTWRAP)
wxFLAGS_MEMBER(wxTE_LINEWRAP)
wxFLAGS_MEMBER(wxTE_CHARWRAP)
wxFLAGS_MEMBER(wxTE_WORDWRAP)
wxEND_FLAGS( wxTextCtrlStyle )

2
src/palmos/gauge.cpp
View File

@@ -90,7 +90,6 @@ wxBEGIN_FLAGS( wxGaugeStyle )
wxFLAGS_MEMBER(wxGA_HORIZONTAL)
wxFLAGS_MEMBER(wxGA_VERTICAL)
wxFLAGS_MEMBER(wxGA_PROGRESSBAR)
wxFLAGS_MEMBER(wxGA_SMOOTH)
wxEND_FLAGS( wxGaugeStyle )
@@ -170,4 +169,3 @@ bool wxGauge::SetBackgroundColour(const wxColour& col)
}
#endif // wxUSE_GAUGE

2
src/palmos/textctrl.cpp
View File

@@ -134,7 +134,7 @@ wxBEGIN_FLAGS( wxTextCtrlStyle )
wxFLAGS_MEMBER(wxTE_CENTRE)
wxFLAGS_MEMBER(wxTE_RIGHT)
wxFLAGS_MEMBER(wxTE_DONTWRAP)
wxFLAGS_MEMBER(wxTE_LINEWRAP)
wxFLAGS_MEMBER(wxTE_CHARWRAP)
wxFLAGS_MEMBER(wxTE_WORDWRAP)
wxEND_FLAGS( wxTextCtrlStyle )

2
src/univ/textctrl.cpp
View File

@@ -2683,7 +2683,7 @@ size_t wxTextCtrl::GetPartOfWrappedLine(const wxChar* text,
//else: we can just see it
// wrap at any character or only at words boundaries?
if ( !(GetWindowStyle() & wxTE_LINEWRAP) )
if ( !(GetWindowStyle() & wxTE_CHARWRAP) )
{
// find the (last) not word char before this word
wxTextCoord colWordStart;

4
src/xrc/xh_gauge.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: xh_gauge.cpp
// Name: src/xrc/xh_gauge.cpp
// Purpose: XRC resource for wxGauge
// Author: Bob Mitchell
// Created: 2000/03/21
@@ -27,7 +27,9 @@ wxGaugeXmlHandler::wxGaugeXmlHandler()
{
XRC_ADD_STYLE(wxGA_HORIZONTAL);
XRC_ADD_STYLE(wxGA_VERTICAL);
#if WXWIN_COMPATIBILITY_2_6
XRC_ADD_STYLE(wxGA_PROGRESSBAR);
#endif // WXWIN_COMPATIBILITY_2_6
XRC_ADD_STYLE(wxGA_SMOOTH); // windows only
AddWindowStyles();
}

4
src/xrc/xh_split.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: xh_split.cpp
// Name: src/xrc/xh_split.cpp
// Purpose: XRC resource for wxSplitterWindow
// Author: panga@freemail.hu, Vaclav Slavik
// Created: 2003/01/26
@@ -28,7 +28,9 @@ wxSplitterWindowXmlHandler::wxSplitterWindowXmlHandler() : wxXmlResourceHandler(
XRC_ADD_STYLE(wxSP_3D);
XRC_ADD_STYLE(wxSP_3DSASH);
XRC_ADD_STYLE(wxSP_3DBORDER);
#if WXWIN_COMPATIBILITY_2_6
XRC_ADD_STYLE(wxSP_FULLSASH);
#endif // WXWIN_COMPATIBILITY_2_6
XRC_ADD_STYLE(wxSP_BORDER);
XRC_ADD_STYLE(wxSP_NOBORDER);
XRC_ADD_STYLE(wxSP_PERMIT_UNSPLIT);

5
src/xrc/xh_text.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: xh_text.cpp
// Name: src/xrc/xh_text.cpp
// Purpose: XRC resource for wxTextCtrl
// Author: Aleksandras Gluchovas
// Created: 2000/03/21
@@ -40,7 +40,10 @@ wxTextCtrlXmlHandler::wxTextCtrlXmlHandler() : wxXmlResourceHandler()
XRC_ADD_STYLE(wxTE_CENTRE);
XRC_ADD_STYLE(wxTE_RIGHT);
XRC_ADD_STYLE(wxTE_DONTWRAP);
#if WXWIN_COMPATIBILITY_2_6
XRC_ADD_STYLE(wxTE_LINEWRAP);
#endif // WXWIN_COMPATIBILITY_2_6
XRC_ADD_STYLE(wxTE_CHARWRAP);
XRC_ADD_STYLE(wxTE_WORDWRAP);
AddWindowStyles();
}

2
utils/configtool/src/propeditor.cpp
View File

@@ -81,7 +81,7 @@ void ctPropertyEditor::CreateControls(wxWindow* parent)
// TODO: find sash pos from last time
int sashPos = 100;
m_splitterWindow = new wxSplitterWindow(parent, ctID_PROPERTY_EDITOR_SPLITTER, wxDefaultPosition, wxSize(500, 400), wxSP_3DSASH|wxSP_FULLSASH/*|wxCLIP_CHILDREN*/ |wxBORDER_NONE|wxNO_FULL_REPAINT_ON_RESIZE);
m_splitterWindow = new wxSplitterWindow(parent, ctID_PROPERTY_EDITOR_SPLITTER, wxDefaultPosition, wxSize(500, 400), wxSP_3DSASH/*|wxCLIP_CHILDREN*/ |wxBORDER_NONE|wxNO_FULL_REPAINT_ON_RESIZE);
m_splitterWindow->SetMinimumPaneSize(10);
m_propertyDescriptionWindow = new wxHtmlWindow(m_splitterWindow, ctID_ATTRIBUTE_EDITOR_DESCRIPTION, wxDefaultPosition, wxSize(200, 60), wxSUNKEN_BORDER);

9
utils/configtool/src/wxconfigtool.pjd
View File

@@ -891,7 +891,7 @@ list below.</value>
<value name="proxy-wxTE_CENTRE" type="bool">FALSE</value>
<value name="proxy-wxTE_RIGHT" type="bool">FALSE</value>
<value name="proxy-wxHSCROLL" type="bool">FALSE</value>
<value name="proxy-wxTE_LINEWRAP" type="bool">FALSE</value>
<value name="proxy-wxTE_CHARWRAP" type="bool">FALSE</value>
<value name="proxy-wxTE_WORDWRAP" type="bool">FALSE</value>
<value name="proxy-wxNO_BORDER" type="bool">FALSE</value>
<value name="proxy-wxSIMPLE_BORDER" type="bool">FALSE</value>
@@ -1450,7 +1450,7 @@ list below.</value>
<value name="proxy-wxTE_CENTRE" type="bool">FALSE</value>
<value name="proxy-wxTE_RIGHT" type="bool">FALSE</value>
<value name="proxy-wxHSCROLL" type="bool">FALSE</value>
<value name="proxy-wxTE_LINEWRAP" type="bool">FALSE</value>
<value name="proxy-wxTE_CHARWRAP" type="bool">FALSE</value>
<value name="proxy-wxTE_WORDWRAP" type="bool">FALSE</value>
<value name="proxy-wxNO_BORDER" type="bool">FALSE</value>
<value name="proxy-wxSIMPLE_BORDER" type="bool">FALSE</value>
@@ -2238,7 +2238,7 @@ list below.</value>
<value name="proxy-wxTE_CENTRE" type="bool">FALSE</value>
<value name="proxy-wxTE_RIGHT" type="bool">FALSE</value>
<value name="proxy-wxHSCROLL" type="bool">FALSE</value>
<value name="proxy-wxTE_LINEWRAP" type="bool">FALSE</value>
<value name="proxy-wxTE_CHARWRAP" type="bool">FALSE</value>
<value name="proxy-wxTE_WORDWRAP" type="bool">FALSE</value>
<value name="proxy-wxNO_BORDER" type="bool">FALSE</value>
<value name="proxy-wxSIMPLE_BORDER" type="bool">FALSE</value>
@@ -2714,7 +2714,6 @@ list below.</value>
<value name="proxy-wxSP_3DBORDER" type="bool">TRUE</value>
<value name="proxy-wxSP_BORDER" type="bool">FALSE</value>
<value name="proxy-wxSP_3DSASH" type="bool">TRUE</value>
<value name="proxy-wxSP_FULLSASH" type="bool">FALSE</value>
<value name="proxy-wxSP_PERMIT_UNSPLIT" type="bool">FALSE</value>
<value name="proxy-wxSP_LIVE_UPDATE " type="bool">FALSE</value>
<value name="proxy-wxNO_BORDER" type="bool">TRUE</value>
@@ -3175,7 +3174,7 @@ list below.</value>
<value name="proxy-wxTE_CENTRE" type="bool">FALSE</value>
<value name="proxy-wxTE_RIGHT" type="bool">FALSE</value>
<value name="proxy-wxHSCROLL" type="bool">FALSE</value>
<value name="proxy-wxTE_LINEWRAP" type="bool">FALSE</value>
<value name="proxy-wxTE_CHARWRAP" type="bool">FALSE</value>
<value name="proxy-wxTE_WORDWRAP" type="bool">FALSE</value>
<value name="proxy-wxNO_BORDER" type="bool">FALSE</value>
<value name="proxy-wxSIMPLE_BORDER" type="bool">FALSE</value>

6
utils/tex2rtf/src/tex2rtf.cpp
View File

@@ -955,7 +955,7 @@ bool Go(void)
frame->SetTitle(buf);
}
wxStartTimer();
wxLongLong localTime = wxGetLocalTimeMillis();
#endif
// Find extension-less filename
@@ -1057,8 +1057,8 @@ bool Go(void)
wxString buf;
#ifndef NO_GUI
long tim = wxGetElapsedTime();
buf.Printf(_T("Finished PASS #%d in %ld seconds.\n"), passNumber, (long)(tim/1000.0));
wxLongLong elapsed = wxGetLocalTimeMillis() - localTime;
buf.Printf(_T("Finished PASS #%d in %ld seconds.\n"), passNumber, (long)(elapsed.GetLo()/1000.0));
OnInform((wxChar *)buf.c_str());
if (errorCount)