projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add some #if wxUSE_XXX (patch 1581470)
[wxWidgets.git]
/
src
/
msw
/
tabctrl.cpp
diff --git
a/src/msw/tabctrl.cpp
b/src/msw/tabctrl.cpp
index 12562fa5f754191294352087500de56b54256ff4..21eb96131ece31557585261e9858108e1fda0545 100644
(file)
--- a/
src/msw/tabctrl.cpp
+++ b/
src/msw/tabctrl.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: tabctrl.cpp
+// Name:
src/msw/
tabctrl.cpp
// Purpose: wxTabCtrl
// Author: Julian Smart
// Modified by:
// Purpose: wxTabCtrl
// Author: Julian Smart
// Modified by:
@@
-9,38
+9,24
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "tabctrl.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx/wx.h"
+ #pragma hdrstop
#endif
#endif
-#if
defined(__WIN95__)
+#if
wxUSE_TAB_DIALOG
-#if !defined(__GNUWIN32__) && !defined(__SALFORDC__)
-#include "malloc.h"
+#ifndef WX_PRECOMP
+ #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
+ #include "wx/wx.h"
+ #include "wx/app.h"
#endif
#endif
-#include <windows.h>
-
-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
- #include <commctrl.h>
-#else
- #include "wx/msw/gnuwin32/extra.h"
-#endif
+#include "wx/msw/private.h"
#include "wx/tabctrl.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,7
+87,9
@@
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.
// Create the toolbar control.
HWND hWndTabCtrl = CreateWindowEx(0L, // No extended styles.
@@
-116,12
+104,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
+120,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
+132,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
+206,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
;
}
}
}
}
@@
-299,7
+288,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 != wxEmptyString
)
+ if (
!text.empty()
)
{
tcItem.mask |= TCIF_TEXT;
wxStrcpy(buf, (const wxChar*) text);
{
tcItem.mask |= TCIF_TEXT;
wxStrcpy(buf, (const wxChar*) text);
@@
-325,7
+314,7
@@
int wxTabCtrl::SetSelection(int item)
void wxTabCtrl::SetImageList(wxImageList* imageList)
{
m_imageList = imageList;
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
}
// Set the text for an item
@@
-440,5
+429,4
@@
void wxMapBitmap(HBITMAP hBitmap, int width, int height)
}
#endif
}
#endif
-#endif
- // __WIN95__
+#endif // wxUSE_TAB_DIALOG