X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/004fd0c8834ca526d335a9294322d9def17ef8a9..6f3f9b50aa275243ade3541ecccb95de22cf57a9:/src/os2/tabctrl.cpp?ds=inline diff --git a/src/os2/tabctrl.cpp b/src/os2/tabctrl.cpp index ea95ab839e..2d4191e90d 100644 --- a/src/os2/tabctrl.cpp +++ b/src/os2/tabctrl.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: tabctrl.cpp +// Name: src/os2/tabctrl.cpp // Purpose: wxTabCtrl // Author: David Webster // Modified by: @@ -12,8 +12,11 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#if wxUSE_TAB_DIALOG + #ifndef WX_PRECOMP -#include "wx/wx.h" + #include "wx/wx.h" + #include "wx/app.h" #endif #include "malloc.h" @@ -23,16 +26,13 @@ //#include "wx/msw/dib.h" #include "wx/os2/tabctrl.h" -#include "wx/app.h" #include "wx/os2/private.h" -#include "wx/generic/imaglist.h" +#include "wx/imaglist.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl) BEGIN_EVENT_TABLE(wxTabCtrl, wxControl) END_EVENT_TABLE() -#endif wxTabCtrl::wxTabCtrl() { @@ -61,8 +61,6 @@ bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons SetParent(parent); - DWORD msflags = 0; - if (width <= 0) width = 100; if (height <= 0) @@ -74,8 +72,6 @@ bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons m_windowId = (id < 0 ? NewControlId() : id); - long tabStyle = 0; - // Create the toolbar control. HWND hWndTabCtrl = 0; // TODO: create tab control @@ -85,7 +81,7 @@ bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons SubclassWin((WXHWND) hWndTabCtrl); - return FALSE; + return false; } wxTabCtrl::~wxTabCtrl() @@ -93,7 +89,9 @@ wxTabCtrl::~wxTabCtrl() UnsubclassWin(); } -bool wxTabCtrl::OS2OnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) +bool wxTabCtrl::OS2OnNotify(int idCtrl, + WXLPARAM WXUNUSED(lParam), + WXLPARAM *WXUNUSED(result) ) { wxTabEvent event(wxEVT_NULL, m_windowId); wxEventType eventType = wxEVT_NULL; @@ -148,14 +146,14 @@ void wxTabCtrl::OnSysColourChanged(wxSysColourChangedEvent& event) bool wxTabCtrl::DeleteAllItems() { // TODO - return FALSE; + return false; } // Delete an item -bool wxTabCtrl::DeleteItem(int item) +bool wxTabCtrl::DeleteItem(int WXUNUSED(item)) { // TODO - return FALSE; + return false; } // Get the selection @@ -186,10 +184,11 @@ int wxTabCtrl::GetItemCount() const } // Get the rect corresponding to the tab -bool wxTabCtrl::GetItemRect(int item, wxRect& wxrect) const +bool wxTabCtrl::GetItemRect(int WXUNUSED(item), + wxRect& WXUNUSED(wxrect)) const { // TODO - return FALSE; + return false; } // Get the number of rows @@ -200,82 +199,85 @@ int wxTabCtrl::GetRowCount() const } // Get the item text -wxString wxTabCtrl::GetItemText(int item) const +wxString wxTabCtrl::GetItemText(int WXUNUSED(item)) const { // TODO - return wxString(""); + return wxEmptyString; } // Get the item image -int wxTabCtrl::GetItemImage(int item) const +int wxTabCtrl::GetItemImage(int WXUNUSED(item)) const { // TODO return 0; } // Get the item data -void* wxTabCtrl::GetItemData(int item) const +void* wxTabCtrl::GetItemData(int WXUNUSED(item)) const { // TODO return NULL; } // Hit test -int wxTabCtrl::HitTest(const wxPoint& pt, long& flags) +int wxTabCtrl::HitTest(const wxPoint& WXUNUSED(pt), long& WXUNUSED(flags)) { // TODO return 0; } // Insert an item -bool wxTabCtrl::InsertItem(int item, const wxString& text, int imageId, void* data) +bool wxTabCtrl::InsertItem(int WXUNUSED(item), + const wxString& WXUNUSED(text), + int WXUNUSED(imageId), + void* WXUNUSED(data)) { // TODO - return FALSE; + return false; } // Set the selection -int wxTabCtrl::SetSelection(int item) +int wxTabCtrl::SetSelection(int WXUNUSED(item)) { // TODO return 0; } // Set the image list -void wxTabCtrl::SetImageList(wxImageList* imageList) +void wxTabCtrl::SetImageList(wxImageList* WXUNUSED(imageList)) { // TODO } // Set the text for an item -bool wxTabCtrl::SetItemText(int item, const wxString& text) +bool wxTabCtrl::SetItemText(int WXUNUSED(item), const wxString& WXUNUSED(text)) { // TODO - return FALSE; + return false; } // Set the image for an item -bool wxTabCtrl::SetItemImage(int item, int image) +bool wxTabCtrl::SetItemImage(int WXUNUSED(item), int WXUNUSED(image)) { // TODO - return FALSE; + return false; } // Set the data for an item -bool wxTabCtrl::SetItemData(int item, void* data) +bool wxTabCtrl::SetItemData(int WXUNUSED(item), void* WXUNUSED(data)) { // TODO - return FALSE; + return false; } // Set the size for a fixed-width tab control -void wxTabCtrl::SetItemSize(const wxSize& size) +void wxTabCtrl::SetItemSize(const wxSize& WXUNUSED(size)) { // TODO } // Set the padding between tabs -void wxTabCtrl::SetPadding(const wxSize& padding) +void wxTabCtrl::SetPadding(const wxSize& WXUNUSED(padding)) { // TODO } @@ -350,9 +352,9 @@ void wxMapBitmap(HBITMAP hBitmap, int width, int height) // Tab event IMPLEMENT_DYNAMIC_CLASS(wxTabEvent, wxCommandEvent) -wxTabEvent::wxTabEvent(wxEventType commandType, int id): - wxCommandEvent(commandType, id) +wxTabEvent::wxTabEvent(wxEventType commandType, int id) + :wxCommandEvent(commandType, id) { } - +#endif // wxUSE_TAB_DIALOG