determine the slider event type more precisely (i.e. generate LINE/PAGE UP/DOWN and...

[wxWidgets.git] / src / os2 / tabctrl.cpp

diff --git a/src/os2/tabctrl.cpp b/src/os2/tabctrl.cpp
index 677ee8a69cf58a808af38496ef1914e24ea5af64..8c35755897f7d42611598c9164a419db1c4914d7 100644 (file)
--- a/src/os2/tabctrl.cpp
+++ b/src/os2/tabctrl.cpp
@@ -25,14 +25,12 @@
 #include "wx/os2/tabctrl.h"
 #include "wx/app.h"
 #include "wx/os2/private.h"
 #include "wx/os2/tabctrl.h"
 #include "wx/app.h"
 #include "wx/os2/private.h"

-#include "wx/os2/imaglist.h"
+#include "wx/generic/imaglist.h"

 
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl)
 
 BEGIN_EVENT_TABLE(wxTabCtrl, wxControl)
 END_EVENT_TABLE()
 IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl)
 
 BEGIN_EVENT_TABLE(wxTabCtrl, wxControl)
 END_EVENT_TABLE()

-#endif

 
 wxTabCtrl::wxTabCtrl()
 {
 
 wxTabCtrl::wxTabCtrl()
 {


@@ -61,8 +59,6 @@ bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
 
     SetParent(parent);
 
 
     SetParent(parent);
 

-    DWORD msflags = 0;
-

     if (width <= 0)
         width = 100;
     if (height <= 0)
     if (width <= 0)
         width = 100;
     if (height <= 0)


@@ -74,8 +70,6 @@ bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
 
     m_windowId = (id < 0 ? NewControlId() : id);
 
 
     m_windowId = (id < 0 ? NewControlId() : id);
 

-    long tabStyle = 0;
-

     // Create the toolbar control.
     HWND hWndTabCtrl = 0;
     // TODO: create tab control
     // Create the toolbar control.
     HWND hWndTabCtrl = 0;
     // TODO: create tab control


@@ -93,7 +87,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;


@@ -148,14 +144,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


@@ -186,10 +182,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


@@ -200,82 +197,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 wxString("");
+    return wxEmptyString;

 }
 
 // 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
 }


@@ -350,9 +350,7 @@ 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)

 {
 }
 {
 }

-
-