/////////////////////////////////////////////////////////////////////////////
-// Name: tabctrl.cpp
+// Name: src/msw/tabctrl.cpp
// Purpose: wxTabCtrl
// Author: Julian Smart
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "tabctrl.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
+#if wxUSE_TAB_DIALOG
-#if defined(__WIN95__)
-
-#if !defined(__GNUWIN32__) && !defined(__SALFORDC__)
-#include "malloc.h"
+#ifndef WX_PRECOMP
+ #include "wx/wx.h"
+ #include "wx/app.h"
#endif
-#include <windows.h>
+#include "wx/msw/private.h"
-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
- #include <commctrl.h>
-#else
- #include "wx/msw/gnuwin32/extra.h"
-#endif
+// include <commctrl.h> "properly"
+#include "wx/msw/wrapcctl.h"
#include "wx/tabctrl.h"
-#include "wx/app.h"
-#include "wx/msw/private.h"
#include "wx/msw/imaglist.h"
IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl)
if (m_windowStyle & wxBORDER)
tabStyle |= WS_BORDER;
+#ifndef __WXWINCE__
tabStyle |= TCS_TOOLTIPS;
+#endif
// Create the toolbar control.
HWND hWndTabCtrl = CreateWindowEx(0L, // No extended styles.
m_hWnd = (WXHWND) hWndTabCtrl;
if (parent) parent->AddChild(this);
-
+
SubclassWin((WXHWND) hWndTabCtrl);
SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
- return TRUE;
+ return true;
}
wxTabCtrl::~wxTabCtrl()
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 )
{
eventType = wxEVT_COMMAND_TAB_SEL_CHANGING;
break;
+#ifndef __WXWINCE__
case TTN_NEEDTEXT:
{
// TODO
-// if (tool->m_shortHelpString != "")
+// if (!tool->m_shortHelpString.empty())
// ttText->lpszText = (char *) (const char *)tool->m_shortHelpString;
}
-
+#endif
default :
return wxControl::MSWOnNotify(idCtrl, lParam, result);
}
{
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;
- return TRUE;
+ return true;
}
}
TC_ITEM tcItem;
tcItem.mask = TCIF_PARAM;
tcItem.lParam = (long) data;
- if (text != wxEmptyString)
+ if (!text.empty())
{
tcItem.mask |= TCIF_TEXT;
wxStrcpy(buf, (const wxChar*) text);
void wxTabCtrl::SetImageList(wxImageList* imageList)
{
m_imageList = imageList;
- TabCtrl_SetImageList( (HWND) GetHWND(), (HIMAGELIST) imageList->GetHIMAGELIST() );
+ (void) TabCtrl_SetImageList( (HWND) GetHWND(), (HIMAGELIST) imageList->GetHIMAGELIST() );
}
// Set the text for an item
}
#endif
-#endif
- // __WIN95__
+#endif // wxUSE_TAB_DIALOG