Try to find comctl32.dll version even if we don't have shlwapi.h available,

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

diff --git a/src/msw/tabctrl.cpp b/src/msw/tabctrl.cpp
index 251e484a3783a2a936e4c3a1d2469a274e46018f..ed230ba329af0f479f2a9d7d0be82b8013ff5c18 100644 (file)
--- a/src/msw/tabctrl.cpp
+++ b/src/msw/tabctrl.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "tabctrl.h"
 #endif
 
 #pragma implementation "tabctrl.h"
 #endif
 


@@ -26,11 +26,7 @@
 
 #if defined(__WIN95__)
 
 
 #if defined(__WIN95__)
 

-#if !defined(__GNUWIN32__) && !defined(__SALFORDC__)
-#include "malloc.h"
-#endif
-
-#include <windows.h>
+#include "wx/msw/private.h"

 
 #if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
     #include <commctrl.h>
 
 #if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
     #include <commctrl.h>


@@ -40,7 +36,6 @@
 
 #include "wx/tabctrl.h"
 #include "wx/app.h"
 
 #include "wx/tabctrl.h"
 #include "wx/app.h"

-#include "wx/msw/private.h"

 #include "wx/msw/imaglist.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl)
 #include "wx/msw/imaglist.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl)


@@ -101,12 +96,14 @@ bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
   if (m_windowStyle & wxBORDER)
     tabStyle |= WS_BORDER;
 
   if (m_windowStyle & wxBORDER)
     tabStyle |= WS_BORDER;
 

+#ifndef __WXWINCE__

   tabStyle |= TCS_TOOLTIPS;
   tabStyle |= TCS_TOOLTIPS;

+#endif

 
   // Create the toolbar control.
   HWND hWndTabCtrl = CreateWindowEx(0L,     // No extended styles.
     WC_TABCONTROL,                          // Class name for the tab control
 
   // Create the toolbar control.
   HWND hWndTabCtrl = CreateWindowEx(0L,     // No extended styles.
     WC_TABCONTROL,                          // Class name for the tab control

-    wxT(""),                                 // No default text.
+    wxEmptyString,                          // No default text.

     tabStyle,    // Styles and defaults.
     x, y, width, height,                    // Standard size and position.
     (HWND) parent->GetHWND(),               // Parent window
     tabStyle,    // Styles and defaults.
     x, y, width, height,                    // Standard size and position.
     (HWND) parent->GetHWND(),               // Parent window


@@ -116,12 +113,12 @@ bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
 
   m_hWnd = (WXHWND) hWndTabCtrl;
   if (parent) parent->AddChild(this);
 
   m_hWnd = (WXHWND) hWndTabCtrl;
   if (parent) parent->AddChild(this);

-  
+

   SubclassWin((WXHWND) hWndTabCtrl);
 
   SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
   SubclassWin((WXHWND) hWndTabCtrl);
 
   SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 

-  return TRUE;
+  return true;

 }
 
 wxTabCtrl::~wxTabCtrl()
 }
 
 wxTabCtrl::~wxTabCtrl()


@@ -132,7 +129,7 @@ wxTabCtrl::~wxTabCtrl()
 bool wxTabCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 {
     wxTabEvent event(wxEVT_NULL, m_windowId);
 bool wxTabCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 {
     wxTabEvent event(wxEVT_NULL, m_windowId);

-    wxEventType eventType = wxEVT_NULL;
+    wxEventType eventType wxDUMMY_INITIALIZE(wxEVT_NULL);

     NMHDR* hdr1 = (NMHDR*) lParam;
     switch ( hdr1->code )
     {
     NMHDR* hdr1 = (NMHDR*) lParam;
     switch ( hdr1->code )
     {


@@ -144,13 +141,14 @@ bool wxTabCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             eventType = wxEVT_COMMAND_TAB_SEL_CHANGING;
             break;
 
             eventType = wxEVT_COMMAND_TAB_SEL_CHANGING;
             break;
 

+#ifndef __WXWINCE__

         case TTN_NEEDTEXT:
         {
             // TODO
         case TTN_NEEDTEXT:
         {
             // TODO

-//            if (tool->m_shortHelpString != "")
+//            if (!tool->m_shortHelpString.empty())

 //                ttText->lpszText = (char *) (const char *)tool->m_shortHelpString;
         }
 //                ttText->lpszText = (char *) (const char *)tool->m_shortHelpString;
         }

-
+#endif

         default :
             return wxControl::MSWOnNotify(idCtrl, lParam, result);
     }
         default :
             return wxControl::MSWOnNotify(idCtrl, lParam, result);
     }


@@ -217,13 +215,13 @@ bool wxTabCtrl::GetItemRect(int item, wxRect& wxrect) const
 {
     RECT rect;
     if ( !TabCtrl_GetItemRect( (HWND) GetHWND(), item, & rect) )
 {
     RECT rect;
     if ( !TabCtrl_GetItemRect( (HWND) GetHWND(), item, & rect) )

-        return FALSE;
+        return false;

     else
     {
         wxrect.x = rect.left; wxrect.y = rect.top;
         wxrect.width = rect.right - rect.left;
         wxrect.height = rect.bottom - rect.top;
     else
     {
         wxrect.x = rect.left; wxrect.y = rect.top;
         wxrect.width = rect.right - rect.left;
         wxrect.height = rect.bottom - rect.top;

-        return TRUE;
+        return true;

     }
 }
 
     }
 }
 


@@ -237,7 +235,7 @@ int wxTabCtrl::GetRowCount() const
 wxString wxTabCtrl::GetItemText(int item) const
 {
     wxChar buf[256];
 wxString wxTabCtrl::GetItemText(int item) const
 {
     wxChar buf[256];

-    wxString str(wxT(""));
+    wxString str(wxEmptyString);

     TC_ITEM tcItem;
     tcItem.mask = TCIF_TEXT;
     tcItem.pszText = buf;
     TC_ITEM tcItem;
     tcItem.mask = TCIF_TEXT;
     tcItem.pszText = buf;


@@ -299,7 +297,7 @@ bool wxTabCtrl::InsertItem(int item, const wxString& text, int imageId, void* da
     TC_ITEM tcItem;
     tcItem.mask = TCIF_PARAM;
     tcItem.lParam = (long) data;
     TC_ITEM tcItem;
     tcItem.mask = TCIF_PARAM;
     tcItem.lParam = (long) data;

-    if (text != wxT(""))
+    if (!text.empty())

     {
         tcItem.mask |= TCIF_TEXT;
         wxStrcpy(buf, (const wxChar*) text);
     {
         tcItem.mask |= TCIF_TEXT;
         wxStrcpy(buf, (const wxChar*) text);