mingw32 compilation fixes

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

diff --git a/src/msw/tabctrl.cpp b/src/msw/tabctrl.cpp
index 20f1d669f103dca47e13a0be17f9a70b8fce9974..b13f837e5e30c36b4d671731c7878571db0123a8 100644 (file)
--- a/src/msw/tabctrl.cpp
+++ b/src/msw/tabctrl.cpp
@@ -32,15 +32,17 @@
 
 #include <windows.h>
 
-#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
 #include <commctrl.h>
 #endif
 
 #ifndef __TWIN32__
 #ifdef __GNUWIN32__
+#ifndef wxUSE_NORLANDER_HEADERS
 #include "wx/msw/gnuwin32/extra.h"
 #endif
 #endif
+#endif
 
 #include "wx/msw/dib.h"
 #include "wx/msw/tabctrl.h"
@@ -114,7 +116,7 @@ bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
   // Create the toolbar control.
   HWND hWndTabCtrl = CreateWindowEx(0L,     // No extended styles.
     WC_TABCONTROL,                          // Class name for the tab control
-    "",                                     // No default text.
+    wxT(""),                                 // No default text.
     WS_CHILD | WS_BORDER | WS_VISIBLE | tabStyle,    // Styles and defaults.
     x, y, width, height,                    // Standard size and position.
     (HWND) parent->GetHWND(),               // Parent window
@@ -241,8 +243,8 @@ int wxTabCtrl::GetRowCount() const
 // Get the item text
 wxString wxTabCtrl::GetItemText(int item) const
 {
-    char buf[256];
-    wxString str("");
+    wxChar buf[256];
+    wxString str(wxT(""));
     TC_ITEM tcItem;
     tcItem.mask = TCIF_TEXT;
     tcItem.pszText = buf;
@@ -300,14 +302,14 @@ int wxTabCtrl::HitTest(const wxPoint& pt, long& flags)
 // Insert an item
 bool wxTabCtrl::InsertItem(int item, const wxString& text, int imageId, void* data)
 {
-    char buf[256];
+    wxChar buf[256];
     TC_ITEM tcItem;
     tcItem.mask = TCIF_PARAM;
     tcItem.lParam = (long) data;
-    if (text != "")
+    if (text != wxT(""))
     {
         tcItem.mask |= TCIF_TEXT;
-        strcpy(buf, (const char*) text);
+        wxStrcpy(buf, (const wxChar*) text);
         tcItem.pszText = buf;
         tcItem.cchTextMax = 256;
     }
@@ -336,10 +338,10 @@ void wxTabCtrl::SetImageList(wxImageList* imageList)
 // Set the text for an item
 bool wxTabCtrl::SetItemText(int item, const wxString& text)
 {
-    char buf[256];
+    wxChar buf[256];
     TC_ITEM tcItem;
     tcItem.mask = TCIF_TEXT;
-    strcpy(buf, (const char*) text);
+    wxStrcpy(buf, (const wxChar*) text);
     tcItem.pszText = buf;
     tcItem.cchTextMax = 256;