Some (incomplete) fixes for wxUSE_STL == 1.

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

diff --git a/src/os2/tabctrl.cpp b/src/os2/tabctrl.cpp
index 677ee8a69cf58a808af38496ef1914e24ea5af64..1b664f8b16d864cc0b44801622af4273548cc255 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