projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Include wx/stopwatch.h according to precompiled headers of wx/wx.h (with other minor...
[wxWidgets.git]
/
src
/
msw
/
tabctrl.cpp
diff --git
a/src/msw/tabctrl.cpp
b/src/msw/tabctrl.cpp
index b13f837e5e30c36b4d671731c7878571db0123a8..a218e6d92300636c4e610e3d50a8a9f97cac4792 100644
(file)
--- a/
src/msw/tabctrl.cpp
+++ b/
src/msw/tabctrl.cpp
@@
-1,62
+1,45
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// 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:
wxWindows licens
e
+// Licence:
wxWindows licenc
e
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-#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
+
#pragma hdrstop
#endif
#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
#endif
-#include <windows.h>
-
-#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
-#include <commctrl.h>
-#endif
+#include "wx/msw/private.h"
-#ifndef __TWIN32__
-#ifdef __GNUWIN32__
-#ifndef wxUSE_NORLANDER_HEADERS
-#include "wx/msw/gnuwin32/extra.h"
-#endif
-#endif
-#endif
+// include <commctrl.h> "properly"
+#include "wx/msw/wrapcctl.h"
-#include "wx/msw/dib.h"
-#include "wx/msw/tabctrl.h"
-#include "wx/app.h"
-#include "wx/msw/private.h"
+#include "wx/tabctrl.h"
#include "wx/msw/imaglist.h"
#include "wx/msw/imaglist.h"
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxTabEvent, wxNotifyEvent)
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TAB_SEL_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TAB_SEL_CHANGING)
BEGIN_EVENT_TABLE(wxTabCtrl, wxControl)
EVT_SYS_COLOUR_CHANGED(wxTabCtrl::OnSysColourChanged)
END_EVENT_TABLE()
BEGIN_EVENT_TABLE(wxTabCtrl, wxControl)
EVT_SYS_COLOUR_CHANGED(wxTabCtrl::OnSysColourChanged)
END_EVENT_TABLE()
-#endif
wxTabCtrl::wxTabCtrl()
{
wxTabCtrl::wxTabCtrl()
{
@@
-81,15
+64,8
@@
bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
m_windowStyle = style;
m_windowStyle = style;
- SetFont(* (wxTheFontList->FindOrCreateFont(11, wxSWISS, wxNORMAL, wxNORMAL)));
-
SetParent(parent);
SetParent(parent);
- DWORD msflags = 0;
- if (style & wxBORDER)
- msflags |= WS_BORDER;
- msflags |= WS_CHILD | WS_VISIBLE;
-
if (width <= 0)
width = 100;
if (height <= 0)
if (width <= 0)
width = 100;
if (height <= 0)
@@
-101,7
+77,7
@@
bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
m_windowId = (id < 0 ? NewControlId() : id);
m_windowId = (id < 0 ? NewControlId() : id);
- long tabStyle =
0
;
+ long tabStyle =
WS_CHILD | WS_VISIBLE
;
if (m_windowStyle & wxTC_MULTILINE)
tabStyle |= TCS_MULTILINE;
if (m_windowStyle & wxTC_RIGHTJUSTIFY)
if (m_windowStyle & wxTC_MULTILINE)
tabStyle |= TCS_MULTILINE;
if (m_windowStyle & wxTC_RIGHTJUSTIFY)
@@
-110,14
+86,18
@@
bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
tabStyle |= TCS_FIXEDWIDTH;
if (m_windowStyle & wxTC_OWNERDRAW)
tabStyle |= TCS_OWNERDRAWFIXED;
tabStyle |= TCS_FIXEDWIDTH;
if (m_windowStyle & wxTC_OWNERDRAW)
tabStyle |= TCS_OWNERDRAWFIXED;
+ 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
- wx
T(""),
// No default text.
-
WS_CHILD | WS_BORDER | WS_VISIBLE |
tabStyle, // Styles and defaults.
+ wx
EmptyString,
// No default text.
+ tabStyle, // Styles and defaults.
x, y, width, height, // Standard size and position.
(HWND) parent->GetHWND(), // Parent window
(HMENU)m_windowId, // ID.
x, y, width, height, // Standard size and position.
(HWND) parent->GetHWND(), // Parent window
(HMENU)m_windowId, // ID.
@@
-126,10
+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);
SubclassWin((WXHWND) hWndTabCtrl);
- return TRUE;
+ SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
+
+ return true;
}
wxTabCtrl::~wxTabCtrl()
}
wxTabCtrl::~wxTabCtrl()
@@
-140,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 )
{
@@
-152,13
+134,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);
}
@@
-166,6
+149,7
@@
bool wxTabCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
event.SetEventObject( this );
event.SetEventType(eventType);
event.SetInt(idCtrl) ;
event.SetEventObject( this );
event.SetEventType(eventType);
event.SetInt(idCtrl) ;
+ event.SetSelection(idCtrl);
return ProcessEvent(event);
}
return ProcessEvent(event);
}
@@
-224,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
;
}
}
}
}
@@
-244,7
+228,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(wx
T("")
);
+ wxString str(wx
EmptyString
);
TC_ITEM tcItem;
tcItem.mask = TCIF_TEXT;
tcItem.pszText = buf;
TC_ITEM tcItem;
tcItem.mask = TCIF_TEXT;
tcItem.pszText = buf;
@@
-306,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 != wxT(""
))
+ if (
!text.empty(
))
{
tcItem.mask |= TCIF_TEXT;
wxStrcpy(buf, (const wxChar*) text);
{
tcItem.mask |= TCIF_TEXT;
wxStrcpy(buf, (const wxChar*) text);
@@
-332,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
@@
-447,14
+431,4
@@
void wxMapBitmap(HBITMAP hBitmap, int width, int height)
}
#endif
}
#endif
-// Tab event
-IMPLEMENT_DYNAMIC_CLASS(wxTabEvent, wxCommandEvent)
-
-wxTabEvent::wxTabEvent(wxEventType commandType, int id):
- wxCommandEvent(commandType, id)
-{
-}
-
-
-#endif
- // __WIN95__
+#endif // wxUSE_TAB_DIALOG