Deprecated and obsolete parts marked up for backward compatibility.

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

diff --git a/contrib/src/deprecated/resource.cpp b/contrib/src/deprecated/resource.cpp
index c3ba5992199ee75e07fe34b552be5b4b17f46a7f..61cfa9570aeba65e9d96b6ce769540bb98e9ed73 100644 (file)
--- a/contrib/src/deprecated/resource.cpp
+++ b/contrib/src/deprecated/resource.cpp
@@ -2105,7 +2105,9 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
     { wxT("wxCB_SORT"), wxCB_SORT },
 
     /* wxGauge */
     { wxT("wxCB_SORT"), wxCB_SORT },
 
     /* wxGauge */

+#if WXWIN_COMPATIBILITY_2_6

     { wxT("wxGA_PROGRESSBAR"), wxGA_PROGRESSBAR },
     { wxT("wxGA_PROGRESSBAR"), wxGA_PROGRESSBAR },

+#endif // WXWIN_COMPATIBILITY_2_6

     { wxT("wxGA_HORIZONTAL"), wxGA_HORIZONTAL },
     { wxT("wxGA_VERTICAL"), wxGA_VERTICAL },
 
     { wxT("wxGA_HORIZONTAL"), wxGA_HORIZONTAL },
     { wxT("wxGA_VERTICAL"), wxGA_VERTICAL },
 

diff --git a/contrib/utils/convertrc/wxr2xml.cpp b/contrib/utils/convertrc/wxr2xml.cpp
index ff46932f3b0fe650ef45f8d2354490b97bfbfe88..ad9cf55656eedfe1773942f89d885fc3f9283b33 100644 (file)
--- a/contrib/utils/convertrc/wxr2xml.cpp
+++ b/contrib/utils/convertrc/wxr2xml.cpp
@@ -1,7 +1,7 @@
 // wxr2xml.cpp: implementation of the wxr2xml class.
 // 8/30/00  Brian Gavin
 // only tested on wxMSW so far
 // 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()
 {

-

 }
 
 wxr2xml::~wxr2xml()
 {
 }
 
 wxr2xml::~wxr2xml()
 {

-

 }
 
 bool wxr2xml::Convert(wxString wxrfile, wxString xmlfile)
 }
 
 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|");
             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|");
     // windows only
         if (style & wxGA_SMOOTH)
             s += _T("wxGA_SMOOTH|");

diff --git a/include/wx/app.h b/include/wx/app.h
index 02e57755fa14e550c2f3f5b9dffdc345e2cd0b57..4fc847b33c37ea7aa210f5d6a62686abb4912e53 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -503,10 +503,12 @@ public:
     // deactivated
     virtual void SetActive(bool isActive, wxWindow *lastFocus);
 
     // 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
     // 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);
 
     // perform standard OnIdle behaviour, ensure that this is always called
     void OnIdle(wxIdleEvent& event);


@@ -549,6 +551,10 @@ protected:
     DECLARE_NO_COPY_CLASS(wxAppBase)
 };
 
     DECLARE_NO_COPY_CLASS(wxAppBase)
 };
 

+#if WXWIN_COMPATIBILITY_2_6
+    inline bool wxAppBase::Initialized() { return true; }
+#endif // WXWIN_COMPATIBILITY_2_6
+

 #endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------


@@ -694,4 +700,3 @@ extern wxAppConsole *wxCreateApp();
 extern wxAppInitializer wxTheAppInitializer;
 
 #endif // _WX_APP_H_BASE_
 extern wxAppInitializer wxTheAppInitializer;
 
 #endif // _WX_APP_H_BASE_

-

diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index 31757e87c9549121303a21360d998a6f66d9b5fa..cb1cffb25be3b6e16f89d8b7a8d66eab5edb31eb 100644 (file)
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -28,8 +28,10 @@
 // Win32 only, is default (and only) on some other platforms
 #define wxGA_SMOOTH          0x0020
 
 // 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[];
 
 
 extern WXDLLEXPORT_DATA(const wxChar) wxGaugeNameStr[];

diff --git a/include/wx/listbox.h b/include/wx/listbox.h
index 219eccff3837298db7e483fe84d3d99c27a5c997..c3bab9220b3a9ba96059132c984371258fe37377 100644 (file)
--- a/include/wx/listbox.h
+++ b/include/wx/listbox.h
@@ -103,12 +103,14 @@ public:
     // event.GetExtraLong())
     void Command(wxCommandEvent& event);
 
     // event.GetExtraLong())
     void Command(wxCommandEvent& event);
 

+#if WXWIN_COMPATIBILITY_2_6

     // compatibility - these functions are deprecated, use the new ones
     // instead
     // 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
 
     // 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
 
 protected:
     // NB: due to wxGTK implementation details, DoInsert() is implemented


@@ -132,6 +134,11 @@ protected:
     DECLARE_NO_COPY_CLASS(wxListBoxBase)
 };
 
     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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // include the platform-specific class declaration
 // ----------------------------------------------------------------------------

diff --git a/include/wx/mstream.h b/include/wx/mstream.h
index 2857dc074d320ab5939fc7e86dc3d23a1dc97f26..ef344236c35740c1b415b2529cc0b0ba00f6909e 100644 (file)
--- a/include/wx/mstream.h
+++ b/include/wx/mstream.h
@@ -33,8 +33,10 @@ public:
 
     wxStreamBuffer *GetInputStreamBuffer() const { return m_i_streambuf; }
 
 
     wxStreamBuffer *GetInputStreamBuffer() const { return m_i_streambuf; }
 

+#if WXWIN_COMPATIBILITY_2_6

     // deprecated, compatibility only
     // deprecated, compatibility only

-    wxStreamBuffer *InputStreamBuffer() const { return m_i_streambuf; }
+    wxDEPRECATED( wxStreamBuffer *InputStreamBuffer() const );
+#endif // WXWIN_COMPATIBILITY_2_6

 
 protected:
     wxStreamBuffer *m_i_streambuf;
 
 protected:
     wxStreamBuffer *m_i_streambuf;


@@ -62,8 +64,10 @@ public:
 
     wxStreamBuffer *GetOutputStreamBuffer() const { return m_o_streambuf; }
 
 
     wxStreamBuffer *GetOutputStreamBuffer() const { return m_o_streambuf; }
 

+#if WXWIN_COMPATIBILITY_2_6

     // deprecated, compatibility only
     // deprecated, compatibility only

-    wxStreamBuffer *OutputStreamBuffer() const { return m_o_streambuf; }
+    wxDEPRECATED( wxStreamBuffer *OutputStreamBuffer() const );
+#endif // WXWIN_COMPATIBILITY_2_6

 
 protected:
     wxStreamBuffer *m_o_streambuf;
 
 protected:
     wxStreamBuffer *m_o_streambuf;


@@ -76,9 +80,13 @@ protected:
     DECLARE_NO_COPY_CLASS(wxMemoryOutputStream)
 };
 
     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__
 #endif
   // wxUSE_STREAMS
 
 #endif
   // _WX_WXMMSTREAM_H__

-

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index 6d26a72c9ff9bcf053a4808199d8470ad78586a9..2553a5b2bcedf9147e8a149e17cd3d465d687821 100644 (file)
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -108,9 +108,7 @@ public:
     // Windows callbacks
     WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
     // 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,
     // use the other ctor
     wxDEPRECATED( wxDialog(wxWindow *parent,
              const wxString& title, bool modal,


@@ -123,6 +121,7 @@ public:
 
     // use IsModal()
     wxDEPRECATED( bool IsModalShowing() const );
 
     // use IsModal()
     wxDEPRECATED( bool IsModalShowing() const );

+#endif // WXWIN_COMPATIBILITY_2_6

 
     // handle Escape here
     virtual bool MSWProcessMessage(WXMSG* pMsg);
 
     // handle Escape here
     virtual bool MSWProcessMessage(WXMSG* pMsg);

diff --git a/include/wx/msw/listctrl.h b/include/wx/msw/listctrl.h
index 895adaea48ed8ff2ec661e49c0f97993469e81ad..92adaffc37db03c61d8ec1390b1e8514717fa6c1 100644 (file)
--- a/include/wx/msw/listctrl.h
+++ b/include/wx/msw/listctrl.h
@@ -363,8 +363,10 @@ public:
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
 
     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);
     // 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;
 
     // convert our styles to Windows
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;


@@ -413,7 +415,7 @@ protected:
     virtual wxString OnGetItemText(long item, long column) const;
 
     // return the icon for the given item. In report view, OnGetItemImage will
     virtual wxString OnGetItemText(long item, long column) const;
 
     // return the icon for the given item. In report view, OnGetItemImage will

-    // only be called for the first column. See OnGetItemColumnImage for 
+    // only be called for the first column. See OnGetItemColumnImage for

     // details.
     virtual int OnGetItemImage(long item) const;
 
     // details.
     virtual int OnGetItemImage(long item) const;
 


@@ -435,4 +437,3 @@ private:
 #endif // wxUSE_LISTCTRL
 
 #endif // _WX_LISTCTRL_H_
 #endif // wxUSE_LISTCTRL
 
 #endif // _WX_LISTCTRL_H_

-

diff --git a/include/wx/os2/dialog.h b/include/wx/os2/dialog.h
index 0c4001e1a3437d95164ef99a077dedc346a39594..d4ae70e32cde00b6674be5a0e24fd672e52d6c9a 100644 (file)
--- a/include/wx/os2/dialog.h
+++ b/include/wx/os2/dialog.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dialog.h
+// Name:        wx/os2/dialog.h

 // Purpose:     wxDialog class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxDialog class
 // Author:      David Webster
 // Modified by:


@@ -90,8 +90,7 @@ public:
                                   ,WXWPARAM wParam
                                   ,WXLPARAM lParam
                                  );
                                   ,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
 
     // 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 );
 
     // 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
 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_
 }; // end of CLASS wxDialog
 
 #endif // _WX_DIALOG_H_

-

diff --git a/include/wx/slider.h b/include/wx/slider.h
index a3c114f06431715a46610b96aa5ec021ee5832f1..6c31343bd7317aada4504da9fcc6e7d65f06ffcd 100644 (file)
--- a/include/wx/slider.h
+++ b/include/wx/slider.h
@@ -40,9 +40,10 @@
 #define wxSL_SELRANGE        0x0800
 #define wxSL_INVERSE         0x1000
 
 #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[];
 
 
 extern WXDLLEXPORT_DATA(const wxChar) wxSliderNameStr[];
 

diff --git a/include/wx/splitter.h b/include/wx/splitter.h
index b2a7cad53288f4c59f78c684fcd417c3c3c2d1e2..ae14d386a6024e41e2ac695c95b114e44ddb0b80 100644 (file)
--- a/include/wx/splitter.h
+++ b/include/wx/splitter.h
@@ -28,9 +28,11 @@
 #define wxSP_BORDER           wxSP_3DBORDER
 #define wxSP_3D               (wxSP_3DBORDER | wxSP_3DSASH)
 
 #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)
 
 BEGIN_DECLARE_EVENT_TYPES()
     DECLARE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, 850)

diff --git a/include/wx/stopwatch.h b/include/wx/stopwatch.h
index 75f789592b1860440847f955c52756c1b8a94f8b..dcb5542f20890ee77ba0edaa3ff863bf61ba615a 100644 (file)
--- a/include/wx/stopwatch.h
+++ b/include/wx/stopwatch.h
@@ -66,17 +66,17 @@ private:
 
 #endif // wxUSE_STOPWATCH
 
 
 #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
 
 // ----------------------------------------------------------------------------
 // global time functions


@@ -100,4 +100,3 @@ extern wxMilliClock_t WXDLLIMPEXP_BASE wxGetLocalTimeMillis();
 #define wxGetCurrentTime() wxGetLocalTime()
 
 #endif // _WX_STOPWATCH_H_
 #define wxGetCurrentTime() wxGetLocalTime()
 
 #endif // _WX_STOPWATCH_H_

-

diff --git a/include/wx/stream.h b/include/wx/stream.h
index 02ecb32f9bc93db03caff3d1d6d680529bf15788..ca3b84eb57ebee606bc297bfab7f9cfb4199697a 100644 (file)
--- a/include/wx/stream.h
+++ b/include/wx/stream.h
@@ -388,8 +388,10 @@ public:
     wxInputStream *GetInputStream() const;
     wxOutputStream *GetOutputStream() const;
 
     wxInputStream *GetInputStream() const;
     wxOutputStream *GetOutputStream() const;
 

+#if WXWIN_COMPATIBILITY_2_6

     // deprecated, for compatibility only
     // 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!
 
     // 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; }
 
     void SetInputStreamBuffer(wxStreamBuffer *buffer);
     wxStreamBuffer *GetInputStreamBuffer() const { return m_i_streambuf; }
 

+#if WXWIN_COMPATIBILITY_2_6

     // deprecated, for compatibility only
     // 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);
 
 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; }
 
     void SetOutputStreamBuffer(wxStreamBuffer *buffer);
     wxStreamBuffer *GetOutputStreamBuffer() const { return m_o_streambuf; }
 

+#if WXWIN_COMPATIBILITY_2_6

     // deprecated, for compatibility only
     // 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);
 
 protected:
     virtual size_t OnSysWrite(const void *buffer, size_t bufsize);


@@ -519,7 +525,12 @@ protected:
     DECLARE_NO_COPY_CLASS(wxBufferedOutputStream)
 };
 
     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__
 #endif // wxUSE_STREAMS
 
 #endif // _WX_WXSTREAM_H__

-

diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index 808239a8532667c8ef5cce81f80aa045be066f7b..03223d69574d400fcf10fb87abd31f79eaf30cc0 100644 (file)
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        textctrl.h
+// Name:        wx/textctrl.h

 // Purpose:     wxTextCtrlBase class - the interface of wxTextCtrl
 // Author:      Vadim Zeitlin
 // Modified by:
 // 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
 
 #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
 
 // 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

diff --git a/include/wx/thread.h b/include/wx/thread.h
index 3ef7e47adec2666aa96d50e4c9877a035fa5dcc1..036b3d0adb60364feb2d3b7c082c0bd2dadd7c52 100644 (file)
--- a/include/wx/thread.h
+++ b/include/wx/thread.h
@@ -349,9 +349,10 @@ public:
     wxCondError Broadcast();
 
 
     wxCondError Broadcast();
 
 

+#if WXWIN_COMPATIBILITY_2_6

     // deprecated version, don't use
     // 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;
 
 private:
     wxConditionInternal *m_internal;


@@ -359,6 +360,11 @@ private:
     DECLARE_NO_COPY_CLASS(wxCondition)
 };
 
     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
 // ----------------------------------------------------------------------------
 // wxSemaphore: a counter limiting the number of threads concurrently accessing
 //              a shared resource

diff --git a/include/wx/treebase.h b/include/wx/treebase.h
index 445b4c28bc3e01a18cbdaac55eb7addc45959c15..92c764441204452c95ed1fcb9b6117f78cbecb0f 100644 (file)
--- a/include/wx/treebase.h
+++ b/include/wx/treebase.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        treebase.h
+// Name:        wx/treebase.h

 // Purpose:     wxTreeCtrl base classes and types
 // Author:      Julian Smart et al
 // Modified by:
 // 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"
 
 #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
 {
 // flags for deprecated `Expand(int action)', will be removed in next versions
 enum
 {


@@ -33,6 +35,8 @@ enum
     wxTREE_EXPAND_TOGGLE
 };
 
     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
 // ----------------------------------------------------------------------------
 // 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
 
 #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
 // 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
 
 
 // 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_
 #endif // wxUSE_TREECTRL
 
 #endif // _WX_TREEBASE_H_

-

diff --git a/include/wx/txtstrm.h b/include/wx/txtstrm.h
index b5d94c749f551c88795d1c191a4dac1d50817660..248af2453a6191c891b8fb315b4ce8c0d83a6f33 100644 (file)
--- a/include/wx/txtstrm.h
+++ b/include/wx/txtstrm.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        txtstrm.h
+// Name:        wx/txtstrm.h

 // Purpose:     Text stream classes
 // Author:      Guilhem Lavaux
 // Modified by:
 // 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();
     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); }
     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); }
 
 
     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;
 protected:
     wxInputStream &m_input;
     wxString m_separators;

diff --git a/include/wx/window.h b/include/wx/window.h
index bb3c6325055f34ccf1e4258e104c0ad05e8a2a66..9f38ecb22db9c683a8c784c67189574d20db23e5 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -1448,8 +1448,11 @@ extern WXDLLEXPORT wxWindow *wxGetActiveWindow();
 // get the (first) top level parent window
 WXDLLEXPORT wxWindow* wxGetTopLevelParent(wxWindow *win);
 
 // 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
 // ----------------------------------------------------------------------------
 
 #if wxUSE_ACCESSIBILITY
 // ----------------------------------------------------------------------------

diff --git a/samples/widgets/textctrl.cpp b/samples/widgets/textctrl.cpp
index c3b4392181b59579093c3ffb4757934896b807ff..3a6c35f698f0f90229bf562345107bbeca376981 100644 (file)
--- a/samples/widgets/textctrl.cpp
+++ b/samples/widgets/textctrl.cpp
@@ -633,7 +633,7 @@ void TextWidgetsPage::CreateText()
             break;
 
         case WrapStyle_Char:
             break;
 
         case WrapStyle_Char:

-            flags |= wxTE_LINEWRAP;
+            flags |= wxTE_CHARWRAP;

             break;
 
         case WrapStyle_Best:
             break;
 
         case WrapStyle_Best:

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index 20b583604cbc66d483559b090cecd5302973f5a7..1894757f21cecb6385f56712ecc4bd9ddd6d3975 100644 (file)
--- a/src/common/txtstrm.cpp
+++ b/src/common/txtstrm.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        txtstrm.cpp
+// Name:        src/common/txtstrm.cpp

 // Purpose:     Text stream classes
 // Author:      Guilhem Lavaux
 // Modified by:
 // Purpose:     Text stream classes
 // Author:      Guilhem Lavaux
 // Modified by:


@@ -178,11 +178,15 @@ double wxTextInputStream::ReadDouble()
     return wxStrtod(word.c_str(), 0);
 }
 
     return wxStrtod(word.c_str(), 0);
 }
 

+#if WXWIN_COMPATIBILITY_2_6
+

 wxString wxTextInputStream::ReadString()
 {
     return ReadLine();
 }
 
 wxString wxTextInputStream::ReadString()
 {
     return ReadLine();
 }
 

+#endif // WXWIN_COMPATIBILITY_2_6
+

 wxString wxTextInputStream::ReadLine()
 {
     wxString line;
 wxString wxTextInputStream::ReadLine()
 {
     wxString line;

diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp
index 505d8321a9fcfd385b70bf8d82b1f0af83d71693..ff8d3faf6f3aec734ebe10bbb970ae905e62a92c 100644 (file)
--- a/src/common/valgen.cpp
+++ b/src/common/valgen.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        valgen.cpp
+// Name:        src/common/valgen.cpp

 // Purpose:     wxGenericValidator class
 // Author:      Kevin Smith
 // Modified by:
 // 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_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
 
     } else
 #endif
 


@@ -375,12 +375,12 @@ bool wxGenericValidator::TransferFromWindow(void)
 #if wxUSE_TOGGLEBTN
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxToggleButton)) )
     {
 #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
 
     } else
 #endif
 


@@ -567,7 +567,7 @@ bool wxGenericValidator::TransferFromWindow(void)
                    count = pControl->GetCount();
             for ( i = 0; i < count; i++ )
             {
                    count = pControl->GetCount();
             for ( i = 0; i < count; i++ )
             {

-                if (pControl->Selected(i))
+                if (pControl->IsSelected(i))

                     m_pArrayInt->Add(i);
             }
 
                     m_pArrayInt->Add(i);
             }
 


@@ -595,4 +595,3 @@ void wxGenericValidator::Initialize()
 
 #endif
   // wxUSE_VALIDATORS
 
 #endif
   // wxUSE_VALIDATORS

-

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index 7afa1c3183f2f3ffbd274aa4017739621366f16f..5df645bb838e164b46438a5424a32e08d906490a 100644 (file)
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -797,7 +797,7 @@ bool wxVariantDataString::Read(wxInputStream& str)
 {
     wxTextInputStream s(str);
 
 {
     wxTextInputStream s(str);
 

-    m_value = s.ReadString();
+    m_value = s.ReadLine();

     return true;
 }
 #endif // wxUSE_STREAMS
     return true;
 }
 #endif // wxUSE_STREAMS

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 96d9a13b6490e88fb18ed3cac648c066ad0cf940..b01e767cfb9df410f66cfa5cbbbe3cb4b6c1f5bf 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -200,6 +200,8 @@ bool wxDialog::Create(wxWindow *parent,
     return true;
 }
 
     return true;
 }
 

+#if WXWIN_COMPATIBILITY_2_6
+

 // deprecated ctor
 wxDialog::wxDialog(wxWindow *parent,
                    const wxString& title,
 // deprecated ctor
 wxDialog::wxDialog(wxWindow *parent,
                    const wxString& title,


@@ -221,6 +223,8 @@ void wxDialog::SetModal(bool WXUNUSED(flag))
     // nothing to do, obsolete method
 }
 
     // nothing to do, obsolete method
 }
 

+#endif // WXWIN_COMPATIBILITY_2_6
+

 wxDialog::~wxDialog()
 {
     m_isBeingDeleted = true;
 wxDialog::~wxDialog()
 {
     m_isBeingDeleted = true;


@@ -233,11 +237,15 @@ wxDialog::~wxDialog()
 // showing the dialogs
 // ----------------------------------------------------------------------------
 
 // showing the dialogs
 // ----------------------------------------------------------------------------
 

+#if WXWIN_COMPATIBILITY_2_6
+

 bool wxDialog::IsModalShowing() const
 {
     return IsModal();
 }
 
 bool wxDialog::IsModalShowing() const
 {
     return IsModal();
 }
 

+#endif // WXWIN_COMPATIBILITY_2_6
+

 wxWindow *wxDialog::FindSuitableParent() const
 {
     // first try to use the currently active window
 wxWindow *wxDialog::FindSuitableParent() const
 {
     // first try to use the currently active window

diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp
index e3ea695d8a4444cd58acede065310e42f941bb7b..2c7a7e6bece0eb5aac938c76b5c1fedfdecdad95 100644 (file)
--- a/src/msw/gauge95.cpp
+++ b/src/msw/gauge95.cpp
@@ -95,7 +95,9 @@ wxBEGIN_FLAGS( wxGaugeStyle )
 
     wxFLAGS_MEMBER(wxGA_HORIZONTAL)
     wxFLAGS_MEMBER(wxGA_VERTICAL)
 
     wxFLAGS_MEMBER(wxGA_HORIZONTAL)
     wxFLAGS_MEMBER(wxGA_VERTICAL)

+#if WXWIN_COMPATIBILITY_2_6

     wxFLAGS_MEMBER(wxGA_PROGRESSBAR)
     wxFLAGS_MEMBER(wxGA_PROGRESSBAR)

+#endif // WXWIN_COMPATIBILITY_2_6

     wxFLAGS_MEMBER(wxGA_SMOOTH)
 
 wxEND_FLAGS( wxGaugeStyle )
     wxFLAGS_MEMBER(wxGA_SMOOTH)
 
 wxEND_FLAGS( wxGaugeStyle )


@@ -217,4 +219,3 @@ bool wxGauge95::SetBackgroundColour(const wxColour& col)
 }
 
 #endif // wxUSE_GAUGE
 }
 
 #endif // wxUSE_GAUGE

-

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index 3524895a5f687b2b4938490a1663d7cb2e7cd093..64051935b0a50c57b0c9e2cc2c221768a87c585f 100644 (file)
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -1063,11 +1063,15 @@ wxSize wxListCtrl::GetItemSpacing() const
     return wxSize(LOWORD(spacing), HIWORD(spacing));
 }
 
     return wxSize(LOWORD(spacing), HIWORD(spacing));
 }
 

+#if WXWIN_COMPATIBILITY_2_6
+

 int wxListCtrl::GetItemSpacing(bool isSmall) const
 {
     return ListView_GetItemSpacing(GetHwnd(), (BOOL) isSmall);
 }
 
 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;
 void wxListCtrl::SetItemTextColour( long item, const wxColour &col )
 {
     wxListItem info;

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 9630d087b9419c51e38a90f5621387e9285cc570..c2c88e5525b35a58f706ff190468715254d52871 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msw/textctrl.cpp
+// Name:        src/msw/textctrl.cpp

 // Purpose:     wxTextCtrl
 // Author:      Julian Smart
 // Modified by:
 // 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_CENTRE)
     wxFLAGS_MEMBER(wxTE_RIGHT)
     wxFLAGS_MEMBER(wxTE_DONTWRAP)

-    wxFLAGS_MEMBER(wxTE_LINEWRAP)
+    wxFLAGS_MEMBER(wxTE_CHARWRAP)

     wxFLAGS_MEMBER(wxTE_WORDWRAP)
 
 wxEND_FLAGS( wxTextCtrlStyle )
     wxFLAGS_MEMBER(wxTE_WORDWRAP)
 
 wxEND_FLAGS( wxTextCtrlStyle )


@@ -372,7 +372,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
         if (!IsInkEdit())
         {
             if ( m_verRichEdit == 2 )
         if (!IsInkEdit())
         {
             if ( m_verRichEdit == 2 )

-            {            
+            {

                 if ( wxRichEditModule::Load(wxRichEditModule::Version_41) )
                 {
                     // yes, class name for version 4.1 really is 5.0
                 if ( wxRichEditModule::Load(wxRichEditModule::Version_41) )
                 {
                     // yes, class name for version 4.1 really is 5.0


@@ -414,7 +414,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
                     m_verRichEdit = 0;
                 }
             }
                     m_verRichEdit = 0;
                 }
             }

-        } // !useInkEdit 
+        } // !useInkEdit

     }
 #endif // wxUSE_RICHEDIT
 
     }
 #endif // wxUSE_RICHEDIT
 


@@ -441,12 +441,12 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
             // Pass IEM_InsertText (0) as wParam, in order to have the ink always
             // converted to text.
             ::SendMessage(GetHwnd(), EM_SETINKINSERTMODE, 0, 0);
             // Pass IEM_InsertText (0) as wParam, in order to have the ink always
             // converted to text.
             ::SendMessage(GetHwnd(), EM_SETINKINSERTMODE, 0, 0);

-            
+

             // Make sure the mouse can be used for input
             ::SendMessage(GetHwnd(), EM_SETUSEMOUSEFORINPUT, 1, 0);
         }
 #endif
             // Make sure the mouse can be used for input
             ::SendMessage(GetHwnd(), EM_SETUSEMOUSEFORINPUT, 1, 0);
         }
 #endif

-        
+

         // enable the events we're interested in: we want to get EN_CHANGE as
         // for the normal controls
         LPARAM mask = ENM_CHANGE;
         // enable the events we're interested in: we want to get EN_CHANGE as
         // for the normal controls
         LPARAM mask = ENM_CHANGE;


@@ -2773,9 +2773,9 @@ bool wxRichEditModule::LoadInkEdit()
     static bool             ms_inkEditLibLoadAttemped;
     if (ms_inkEditLibLoadAttemped)
         ms_inkEditLib.IsLoaded();
     static bool             ms_inkEditLibLoadAttemped;
     if (ms_inkEditLibLoadAttemped)
         ms_inkEditLib.IsLoaded();

-    
+

     ms_inkEditLibLoadAttemped = true;
     ms_inkEditLibLoadAttemped = true;

-    
+

     wxLogNull logNull;
     return ms_inkEditLib.Load(wxT("inked"));
 }
     wxLogNull logNull;
     return ms_inkEditLib.Load(wxT("inked"));
 }

diff --git a/src/palmos/gauge.cpp b/src/palmos/gauge.cpp
index 8cc132983f84d9502862aa3e0b5fcf2ad0dcde6e..157c7b9294f01982c0d87384052463f2d66613c3 100644 (file)
--- a/src/palmos/gauge.cpp
+++ b/src/palmos/gauge.cpp
@@ -90,7 +90,6 @@ wxBEGIN_FLAGS( wxGaugeStyle )
 
     wxFLAGS_MEMBER(wxGA_HORIZONTAL)
     wxFLAGS_MEMBER(wxGA_VERTICAL)
 
     wxFLAGS_MEMBER(wxGA_HORIZONTAL)
     wxFLAGS_MEMBER(wxGA_VERTICAL)

-    wxFLAGS_MEMBER(wxGA_PROGRESSBAR)

     wxFLAGS_MEMBER(wxGA_SMOOTH)
 
 wxEND_FLAGS( wxGaugeStyle )
     wxFLAGS_MEMBER(wxGA_SMOOTH)
 
 wxEND_FLAGS( wxGaugeStyle )


@@ -170,4 +169,3 @@ bool wxGauge::SetBackgroundColour(const wxColour& col)
 }
 
 #endif // wxUSE_GAUGE
 }
 
 #endif // wxUSE_GAUGE

-

diff --git a/src/palmos/textctrl.cpp b/src/palmos/textctrl.cpp
index d6473c6d3cab37f31927625943f08d18419d7ea3..1e572769a570ba5230773c3dadac28f8023522b6 100644 (file)
--- a/src/palmos/textctrl.cpp
+++ b/src/palmos/textctrl.cpp
@@ -134,7 +134,7 @@ wxBEGIN_FLAGS( wxTextCtrlStyle )
     wxFLAGS_MEMBER(wxTE_CENTRE)
     wxFLAGS_MEMBER(wxTE_RIGHT)
     wxFLAGS_MEMBER(wxTE_DONTWRAP)
     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 )
     wxFLAGS_MEMBER(wxTE_WORDWRAP)
 
 wxEND_FLAGS( wxTextCtrlStyle )

diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp
index 1d7c6567d9d4d7e720b72d21af9e46c20b120eb0..e6543e5bd1ebd2da9505a39b62b8554c021cd762 100644 (file)
--- a/src/univ/textctrl.cpp
+++ b/src/univ/textctrl.cpp
@@ -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?
                 //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;
                 {
                     // find the (last) not word char before this word
                     wxTextCoord colWordStart;

diff --git a/src/xrc/xh_gauge.cpp b/src/xrc/xh_gauge.cpp
index 832c7e3960d08ba893acb6e414fc7b20cb3a4527..2b8a9b97910fe736eb723882a5cab01c5985ba8b 100644 (file)
--- a/src/xrc/xh_gauge.cpp
+++ b/src/xrc/xh_gauge.cpp
@@ -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
 // 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);
 {
     XRC_ADD_STYLE(wxGA_HORIZONTAL);
     XRC_ADD_STYLE(wxGA_VERTICAL);

+#if WXWIN_COMPATIBILITY_2_6

     XRC_ADD_STYLE(wxGA_PROGRESSBAR);
     XRC_ADD_STYLE(wxGA_PROGRESSBAR);

+#endif // WXWIN_COMPATIBILITY_2_6

     XRC_ADD_STYLE(wxGA_SMOOTH);   // windows only
     AddWindowStyles();
 }
     XRC_ADD_STYLE(wxGA_SMOOTH);   // windows only
     AddWindowStyles();
 }

diff --git a/src/xrc/xh_split.cpp b/src/xrc/xh_split.cpp
index b3ba2adec86d103ee45e628d6e802f51903cd5ff..f9e89a36bdc5ec0bd38da43a73a8037448aae5a2 100644 (file)
--- a/src/xrc/xh_split.cpp
+++ b/src/xrc/xh_split.cpp
@@ -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
 // 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);
     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);
     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);
     XRC_ADD_STYLE(wxSP_BORDER);
     XRC_ADD_STYLE(wxSP_NOBORDER);
     XRC_ADD_STYLE(wxSP_PERMIT_UNSPLIT);

diff --git a/src/xrc/xh_text.cpp b/src/xrc/xh_text.cpp
index 7adc43d65aa05c190cdb7273d9bc9fb58b6b4f48..fa824f48cbbfce3f84d5c611f26fb5e632f82751 100644 (file)
--- a/src/xrc/xh_text.cpp
+++ b/src/xrc/xh_text.cpp
@@ -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
 // 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);
     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);
     XRC_ADD_STYLE(wxTE_LINEWRAP);

+#endif // WXWIN_COMPATIBILITY_2_6
+    XRC_ADD_STYLE(wxTE_CHARWRAP);

     XRC_ADD_STYLE(wxTE_WORDWRAP);
     AddWindowStyles();
 }
     XRC_ADD_STYLE(wxTE_WORDWRAP);
     AddWindowStyles();
 }

diff --git a/utils/configtool/src/propeditor.cpp b/utils/configtool/src/propeditor.cpp
index 286f9d438e158ff8dcd5095838e71a1f14078e8f..db938dfd655ef43066fce6172dacd2e2b48bf67e 100644 (file)
--- a/utils/configtool/src/propeditor.cpp
+++ b/utils/configtool/src/propeditor.cpp
@@ -81,7 +81,7 @@ void ctPropertyEditor::CreateControls(wxWindow* parent)
     // TODO: find sash pos from last time
     int sashPos = 100;
 
     // 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);
     m_splitterWindow->SetMinimumPaneSize(10);
 
     m_propertyDescriptionWindow = new wxHtmlWindow(m_splitterWindow, ctID_ATTRIBUTE_EDITOR_DESCRIPTION, wxDefaultPosition, wxSize(200, 60), wxSUNKEN_BORDER);

diff --git a/utils/configtool/src/wxconfigtool.pjd b/utils/configtool/src/wxconfigtool.pjd
index a4db7112c06965ce9b22fa76d3288fac8b2dbef1..2f2c8d591b0bcafed9b5254c6ae215e34ee12d2a 100644 (file)
--- a/utils/configtool/src/wxconfigtool.pjd
+++ b/utils/configtool/src/wxconfigtool.pjd
@@ -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_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>
                                                        <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_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>
                                                        <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_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>
                                                                                        <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_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>
                                                <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_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>
                                                                        <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>

diff --git a/utils/tex2rtf/src/tex2rtf.cpp b/utils/tex2rtf/src/tex2rtf.cpp
index e92fc999cc02e3a82896d393fe04110dc6123cb4..75a889fb4faf3ce52ea523e2fd1ebb733746202c 100644 (file)
--- a/utils/tex2rtf/src/tex2rtf.cpp
+++ b/utils/tex2rtf/src/tex2rtf.cpp
@@ -955,7 +955,7 @@ bool Go(void)
     frame->SetTitle(buf);
   }
 
     frame->SetTitle(buf);
   }
 

-  wxStartTimer();
+  wxLongLong localTime = wxGetLocalTimeMillis();

 #endif
 
   // Find extension-less filename
 #endif
 
   // Find extension-less filename


@@ -1057,8 +1057,8 @@ bool Go(void)
 
     wxString buf;
 #ifndef NO_GUI
 
     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)
     OnInform((wxChar *)buf.c_str());
 
     if (errorCount)