projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor source cleaning.
[wxWidgets.git]
/
src
/
msw
/
tabctrl.cpp
diff --git
a/src/msw/tabctrl.cpp
b/src/msw/tabctrl.cpp
index 19c510339c354b04cc5b990be9f193d1a6cef0b6..a218e6d92300636c4e610e3d50a8a9f97cac4792 100644
(file)
--- a/
src/msw/tabctrl.cpp
+++ b/
src/msw/tabctrl.cpp
@@
-1,41
+1,34
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: tabctrl.cpp
+// Name:
src/msw/
tabctrl.cpp
// Purpose: wxTabCtrl
// Author: Julian Smart
// Modified by:
// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Purpose: wxTabCtrl
// Author: Julian Smart
// Modified by:
// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWi
dget
s licence
+// Licence: wxWi
ndow
s licence
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#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
+
#pragma hdrstop
#endif
#endif
+#if wxUSE_TAB_DIALOG
+
#ifndef WX_PRECOMP
#ifndef WX_PRECOMP
-#include "wx/wx.h"
+ #include "wx/wx.h"
+ #include "wx/app.h"
#endif
#endif
-#if defined(__WIN95__)
-
#include "wx/msw/private.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/tabctrl.h"
-#include "wx/app.h"
#include "wx/msw/imaglist.h"
IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl)
#include "wx/msw/imaglist.h"
IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl)
@@
-113,12
+106,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()
@@
-129,7
+122,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 )
{
@@
-145,7
+138,7
@@
bool wxTabCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
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;
}
#endif
// ttText->lpszText = (char *) (const char *)tool->m_shortHelpString;
}
#endif
@@
-215,13
+208,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
;
}
}
}
}
@@
-297,7
+290,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);
@@
-323,7
+316,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
@@
-438,5
+431,4
@@
void wxMapBitmap(HBITMAP hBitmap, int width, int height)
}
#endif
}
#endif
-#endif
- // __WIN95__
+#endif // wxUSE_TAB_DIALOG