projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use GetFileAttributes() to check for readonly files under Win9x, the NT method doesn...
[wxWidgets.git]
/
src
/
os2
/
tabctrl.cpp
diff --git
a/src/os2/tabctrl.cpp
b/src/os2/tabctrl.cpp
index 17f96a705d623ca7b780efe280b76167f8e7e090..2d4191e90d8518eeb141beee190814fc16aa1e1b 100644
(file)
--- 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:
// Purpose: wxTabCtrl
// Author: David Webster
// Modified by:
@@
-12,8
+12,11
@@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
+#if wxUSE_TAB_DIALOG
+
#ifndef WX_PRECOMP
#ifndef WX_PRECOMP
-#include "wx/wx.h"
+ #include "wx/wx.h"
+ #include "wx/app.h"
#endif
#include "malloc.h"
#endif
#include "malloc.h"
@@
-23,9
+26,8
@@
//#include "wx/msw/dib.h"
#include "wx/os2/tabctrl.h"
//#include "wx/msw/dib.h"
#include "wx/os2/tabctrl.h"
-#include "wx/app.h"
#include "wx/os2/private.h"
#include "wx/os2/private.h"
-#include "wx/
generic/
imaglist.h"
+#include "wx/imaglist.h"
IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl)
@@
-79,7
+81,7
@@
bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
SubclassWin((WXHWND) hWndTabCtrl);
SubclassWin((WXHWND) hWndTabCtrl);
- return
FALSE
;
+ return
false
;
}
wxTabCtrl::~wxTabCtrl()
}
wxTabCtrl::~wxTabCtrl()
@@
-87,7
+89,9
@@
wxTabCtrl::~wxTabCtrl()
UnsubclassWin();
}
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;
{
wxTabEvent event(wxEVT_NULL, m_windowId);
wxEventType eventType = wxEVT_NULL;
@@
-142,14
+146,14
@@
void wxTabCtrl::OnSysColourChanged(wxSysColourChangedEvent& event)
bool wxTabCtrl::DeleteAllItems()
{
// TODO
bool wxTabCtrl::DeleteAllItems()
{
// TODO
- return
FALSE
;
+ return
false
;
}
// Delete an item
}
// Delete an item
-bool wxTabCtrl::DeleteItem(int
item
)
+bool wxTabCtrl::DeleteItem(int
WXUNUSED(item)
)
{
// TODO
{
// TODO
- return
FALSE
;
+ return
false
;
}
// Get the selection
}
// Get the selection
@@
-180,10
+184,11
@@
int wxTabCtrl::GetItemCount() const
}
// Get the rect corresponding to the tab
}
// 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
{
// TODO
- return
FALSE
;
+ return
false
;
}
// Get the number of rows
}
// Get the number of rows
@@
-194,82
+199,85
@@
int wxTabCtrl::GetRowCount() const
}
// Get the item text
}
// Get the item text
-wxString wxTabCtrl::GetItemText(int
item
) const
+wxString wxTabCtrl::GetItemText(int
WXUNUSED(item)
) const
{
// TODO
{
// TODO
- return wx
String(wxEmptyString)
;
+ return wx
EmptyString
;
}
// Get the item image
}
// Get the item image
-int wxTabCtrl::GetItemImage(int
item
) const
+int wxTabCtrl::GetItemImage(int
WXUNUSED(item)
) const
{
// TODO
return 0;
}
// Get the item data
{
// 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
{
// 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
{
// 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
{
// TODO
- return
FALSE
;
+ return
false
;
}
// Set the selection
}
// Set the selection
-int wxTabCtrl::SetSelection(int
item
)
+int wxTabCtrl::SetSelection(int
WXUNUSED(item)
)
{
// TODO
return 0;
}
// Set the image list
{
// 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
{
// 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
{
// TODO
- return
FALSE
;
+ return
false
;
}
// Set the image for an item
}
// Set the image for an item
-bool wxTabCtrl::SetItemImage(int
item, int image
)
+bool wxTabCtrl::SetItemImage(int
WXUNUSED(item), int WXUNUSED(image)
)
{
// TODO
{
// TODO
- return
FALSE
;
+ return
false
;
}
// Set the data for an item
}
// Set the data for an item
-bool wxTabCtrl::SetItemData(int
item, void* data
)
+bool wxTabCtrl::SetItemData(int
WXUNUSED(item), void* WXUNUSED(data)
)
{
// TODO
{
// TODO
- return
FALSE
;
+ return
false
;
}
// Set the size for a fixed-width tab control
}
// 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
{
// TODO
}
// Set the padding between tabs
-void wxTabCtrl::SetPadding(const wxSize&
padding
)
+void wxTabCtrl::SetPadding(const wxSize&
WXUNUSED(padding)
)
{
// TODO
}
{
// TODO
}
@@
-344,9
+352,9
@@
void wxMapBitmap(HBITMAP hBitmap, int width, int height)
// Tab event
IMPLEMENT_DYNAMIC_CLASS(wxTabEvent, wxCommandEvent)
// 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