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

removed wxABI_TESTS, they're irrelvant in 2.9

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-01-31 03:40:59 +00:00
parent ccee328e0b
commit a56a1234a5
10 changed files with 73 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/aui/auibook.h
View File

@@ -531,9 +531,7 @@ public:
virtual void Split(size_t page, int direction); virtual void Split(size_t page, int direction);
#if wxABI_VERSION >= 20801
const wxAuiManager& GetAuiManager() const { return m_mgr; } const wxAuiManager& GetAuiManager() const { return m_mgr; }
#endif
protected: protected:

2
include/wx/datetime.h
View File

@@ -639,11 +639,9 @@ public:
// resets time to 00:00:00, doesn't change the date // resets time to 00:00:00, doesn't change the date
wxDateTime& ResetTime(); wxDateTime& ResetTime();
#if wxABI_VERSION >= 20802
// get the date part of this object only, i.e. the object which has the // get the date part of this object only, i.e. the object which has the
// same date as this one but time of 00:00:00 // same date as this one but time of 00:00:00
wxDateTime GetDateOnly() const; wxDateTime GetDateOnly() const;
#endif // wxABI 2.8.1+
// the following functions don't change the values of the other // the following functions don't change the values of the other
// fields, i.e. SetMinute() won't change either hour or seconds value // fields, i.e. SetMinute() won't change either hour or seconds value

2
include/wx/docview.h
View File

@@ -594,11 +594,9 @@ public:
const wxList& GetMenus() const { return m_fileMenus; } const wxList& GetMenus() const { return m_fileMenus; }
#if wxABI_VERSION >= 20802
// Set/get base id // Set/get base id
void SetBaseId(wxWindowID baseId) { m_idBase = baseId; } void SetBaseId(wxWindowID baseId) { m_idBase = baseId; }
wxWindowID GetBaseId() const { return m_idBase; } wxWindowID GetBaseId() const { return m_idBase; }
#endif // wxABI 2.8.2+
#if WXWIN_COMPATIBILITY_2_6 #if WXWIN_COMPATIBILITY_2_6
// deprecated, use GetCount() instead // deprecated, use GetCount() instead

2
include/wx/generic/srchctlg.h
View File

@@ -60,11 +60,9 @@ public:
virtual void ShowCancelButton( bool show ); virtual void ShowCancelButton( bool show );
virtual bool IsCancelButtonVisible() const; virtual bool IsCancelButtonVisible() const;
#if wxABI_VERSION >= 20802
// TODO: In 2.9 these should probably be virtual, and declared in the base class... // TODO: In 2.9 these should probably be virtual, and declared in the base class...
void SetDescriptiveText(const wxString& text); void SetDescriptiveText(const wxString& text);
wxString GetDescriptiveText() const; wxString GetDescriptiveText() const;
#endif
// accessors // accessors
// --------- // ---------

2
include/wx/mac/carbon/listctrl.h
View File

@@ -344,13 +344,11 @@ class WXDLLEXPORT wxListCtrl: public wxControl
virtual int GetScrollPos(int orient) const; virtual int GetScrollPos(int orient) const;
#if wxABI_VERSION >= 20801
void OnRightDown(wxMouseEvent& event); void OnRightDown(wxMouseEvent& event);
void OnMiddleDown(wxMouseEvent& event); void OnMiddleDown(wxMouseEvent& event);
void OnChar(wxKeyEvent& event); void OnChar(wxKeyEvent& event);
virtual void SetFocus(); virtual void SetFocus();
void FireMouseEvent(wxEventType eventType, wxPoint position); void FireMouseEvent(wxEventType eventType, wxPoint position);
#endif
virtual void SetDropTarget( wxDropTarget *dropTarget ); virtual void SetDropTarget( wxDropTarget *dropTarget );
virtual wxDropTarget* GetDropTarget() const; virtual wxDropTarget* GetDropTarget() const;

2
include/wx/mac/carbon/srchctrl.h
View File

@@ -53,11 +53,9 @@ public:
virtual void ShowCancelButton( bool show ); virtual void ShowCancelButton( bool show );
virtual bool IsCancelButtonVisible() const; virtual bool IsCancelButtonVisible() const;
#if wxABI_VERSION >= 20802
// TODO: In 2.9 these should probably be virtual, and declared in the base class... // TODO: In 2.9 these should probably be virtual, and declared in the base class...
void SetDescriptiveText(const wxString& text); void SetDescriptiveText(const wxString& text);
wxString GetDescriptiveText() const; wxString GetDescriptiveText() const;
#endif
virtual wxInt32 MacSearchFieldSearchHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ; virtual wxInt32 MacSearchFieldSearchHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
virtual wxInt32 MacSearchFieldCancelHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ; virtual wxInt32 MacSearchFieldCancelHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;

34
include/wx/mediactrl.h
View File

@@ -191,12 +191,9 @@ public:
wxFileOffset Tell(); //FIXME: This should be const wxFileOffset Tell(); //FIXME: This should be const
wxFileOffset Length(); //FIXME: This should be const wxFileOffset Length(); //FIXME: This should be const
#if wxABI_VERSION >= 20601 /* 2.6.1+ only */
double GetPlaybackRate(); //All but MCI & GStreamer double GetPlaybackRate(); //All but MCI & GStreamer
bool SetPlaybackRate(double dRate); //All but MCI & GStreamer bool SetPlaybackRate(double dRate); //All but MCI & GStreamer
#endif
#if wxABI_VERSION >= 20602 /* 2.6.2+ only */
bool Load(const wxURI& location); bool Load(const wxURI& location);
bool Load(const wxURI& location, const wxURI& proxy); bool Load(const wxURI& location, const wxURI& proxy);
@@ -214,7 +211,6 @@ public:
{ return Load(wxURI(fileName)); } { return Load(wxURI(fileName)); }
bool LoadURIWithProxy(const wxString& fileName, const wxString& proxy) bool LoadURIWithProxy(const wxString& fileName, const wxString& proxy)
{ return Load(wxURI(fileName), wxURI(proxy)); } { return Load(wxURI(fileName), wxURI(proxy)); }
#endif
protected: protected:
static wxClassInfo* NextBackend(); static wxClassInfo* NextBackend();
@@ -348,23 +344,19 @@ typedef void (wxEvtHandler::*wxMediaEventFunction)(wxMediaEvent&);
#define EVT_MEDIA_FINISHED(winid, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_MEDIA_FINISHED, winid, wxID_ANY, wxMediaEventHandler(fn), (wxObject *) NULL ), #define EVT_MEDIA_FINISHED(winid, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_MEDIA_FINISHED, winid, wxID_ANY, wxMediaEventHandler(fn), (wxObject *) NULL ),
#define EVT_MEDIA_STOP(winid, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_MEDIA_STOP, winid, wxID_ANY, wxMediaEventHandler(fn), (wxObject *) NULL ), #define EVT_MEDIA_STOP(winid, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_MEDIA_STOP, winid, wxID_ANY, wxMediaEventHandler(fn), (wxObject *) NULL ),
#if wxABI_VERSION >= 20602 /* 2.6.2+ only */ #define wxMEDIA_LOADED_ID 13002
# define wxMEDIA_LOADED_ID 13002 DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_MEDIA, wxEVT_MEDIA_LOADED, wxMEDIA_LOADED_ID)
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_MEDIA, wxEVT_MEDIA_LOADED, wxMEDIA_LOADED_ID) #define EVT_MEDIA_LOADED(winid, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_MEDIA_LOADED, winid, wxID_ANY, wxMediaEventHandler(fn), (wxObject *) NULL ),
# define EVT_MEDIA_LOADED(winid, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_MEDIA_LOADED, winid, wxID_ANY, wxMediaEventHandler(fn), (wxObject *) NULL ),
#endif
#if wxABI_VERSION >= 20603 /* 2.6.3+ only */ #define wxMEDIA_STATECHANGED_ID 13003
# define wxMEDIA_STATECHANGED_ID 13003 #define wxMEDIA_PLAY_ID 13004
# define wxMEDIA_PLAY_ID 13004 #define wxMEDIA_PAUSE_ID 13005
# define wxMEDIA_PAUSE_ID 13005 DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_MEDIA, wxEVT_MEDIA_STATECHANGED, wxMEDIA_STATECHANGED_ID)
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_MEDIA, wxEVT_MEDIA_STATECHANGED, wxMEDIA_STATECHANGED_ID) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_MEDIA, wxEVT_MEDIA_PLAY, wxMEDIA_PLAY_ID)
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_MEDIA, wxEVT_MEDIA_PLAY, wxMEDIA_PLAY_ID) DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_MEDIA, wxEVT_MEDIA_PAUSE, wxMEDIA_PAUSE_ID)
DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_MEDIA, wxEVT_MEDIA_PAUSE, wxMEDIA_PAUSE_ID) #define EVT_MEDIA_STATECHANGED(winid, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_MEDIA_STATECHANGED, winid, wxID_ANY, wxMediaEventHandler(fn), (wxObject *) NULL ),
# define EVT_MEDIA_STATECHANGED(winid, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_MEDIA_STATECHANGED, winid, wxID_ANY, wxMediaEventHandler(fn), (wxObject *) NULL ), #define EVT_MEDIA_PLAY(winid, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_MEDIA_PLAY, winid, wxID_ANY, wxMediaEventHandler(fn), (wxObject *) NULL ),
# define EVT_MEDIA_PLAY(winid, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_MEDIA_PLAY, winid, wxID_ANY, wxMediaEventHandler(fn), (wxObject *) NULL ), #define EVT_MEDIA_PAUSE(winid, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_MEDIA_PAUSE, winid, wxID_ANY, wxMediaEventHandler(fn), (wxObject *) NULL ),
# define EVT_MEDIA_PAUSE(winid, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_MEDIA_PAUSE, winid, wxID_ANY, wxMediaEventHandler(fn), (wxObject *) NULL ),
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// common backend base class used by many other backends // common backend base class used by many other backends
@@ -379,9 +371,7 @@ public:
// notify that the movie playback is finished // notify that the movie playback is finished
void QueueFinishEvent() void QueueFinishEvent()
{ {
#if wxABI_VERSION >= 20603 /* 2.6.3+ only */
QueueEvent(wxEVT_MEDIA_STATECHANGED); QueueEvent(wxEVT_MEDIA_STATECHANGED);
#endif
QueueEvent(wxEVT_MEDIA_FINISHED); QueueEvent(wxEVT_MEDIA_FINISHED);
} }

2
include/wx/sizer.h
View File

@@ -155,7 +155,6 @@ public:
#endif #endif
} }
#if wxABI_VERSION >= 20802
// setters for the others flags // setters for the others flags
wxSizerFlags& Shaped() wxSizerFlags& Shaped()
{ {
@@ -170,7 +169,6 @@ public:
return *this; return *this;
} }
#endif // wx 2.8.2+
// accessors for wxSizer only // accessors for wxSizer only
int GetProportion() const { return m_proportion; } int GetProportion() const { return m_proportion; }

2
include/wx/strconv.h
View File

@@ -385,10 +385,8 @@ public:
void Clear(); void Clear();
#if wxABI_VERSION >= 20802
// return true if the conversion could be initilized successfully // return true if the conversion could be initilized successfully
bool IsOk() const; bool IsOk() const;
#endif // wx 2.8.2+
private: private:
// common part of all ctors // common part of all ctors

4
include/wx/treectrl.h
View File

@@ -172,10 +172,8 @@ public:
virtual bool IsSelected(const wxTreeItemId& item) const = 0; virtual bool IsSelected(const wxTreeItemId& item) const = 0;
// is item text in bold font? // is item text in bold font?
virtual bool IsBold(const wxTreeItemId& item) const = 0; virtual bool IsBold(const wxTreeItemId& item) const = 0;
#if wxABI_VERSION >= 20801
// is the control empty? // is the control empty?
bool IsEmpty() const; bool IsEmpty() const;
#endif // wxABI 2.8.1+
// number of children // number of children
@@ -298,12 +296,10 @@ public:
void ExpandAll(); void ExpandAll();
// collapse the item without removing its children // collapse the item without removing its children
virtual void Collapse(const wxTreeItemId& item) = 0; virtual void Collapse(const wxTreeItemId& item) = 0;
#if wxABI_VERSION >= 20801
// collapse the item and all its childs and thats childs // collapse the item and all its childs and thats childs
void CollapseAllChildren(const wxTreeItemId& item); void CollapseAllChildren(const wxTreeItemId& item);
// collapse all items // collapse all items
void CollapseAll(); void CollapseAll();
#endif // wxABI 2.8.1+
// collapse the item and remove all children // collapse the item and remove all children
virtual void CollapseAndReset(const wxTreeItemId& item) = 0; virtual void CollapseAndReset(const wxTreeItemId& item) = 0;
// toggles the current state // toggles the current state