// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows license
+// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#endif
#ifndef WX_PRECOMP
-#include "wx.h"
+#include "wx/wx.h"
#endif
#if defined(__WIN95__)
-#ifndef __GNUWIN32__
+#if !defined(__GNUWIN32__) && !defined(__SALFORDC__)
#include "malloc.h"
#endif
#include <windows.h>
-#ifndef __GNUWIN32__
-#include <commctrl.h>
-#endif
-
-#ifdef __GNUWIN32__
-#include "wx/msw/gnuwin32/extra.h"
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
+ #include <commctrl.h>
+#else
+ #include "wx/msw/gnuwin32/extra.h"
#endif
#include "wx/msw/dib.h"
-#include "wx/msw/tabctrl.h"
+#include "wx/tabctrl.h"
#include "wx/app.h"
#include "wx/msw/private.h"
#include "wx/msw/imaglist.h"
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TAB_SEL_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TAB_SEL_CHANGING)
+
BEGIN_EVENT_TABLE(wxTabCtrl, wxControl)
- EVT_SIZE(wxTabCtrl::OnSize)
- EVT_PAINT(wxTabCtrl::OnPaint)
- EVT_KILL_FOCUS(wxTabCtrl::OnKillFocus)
- EVT_MOUSE_EVENTS(wxTabCtrl::OnMouseEvent)
EVT_SYS_COLOUR_CHANGED(wxTabCtrl::OnSysColourChanged)
END_EVENT_TABLE()
-#endif
-wxTabCtrl::wxTabCtrl(void)
+wxTabCtrl::wxTabCtrl()
{
m_imageList = NULL;
}
-bool wxTabCtrl::Create(wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size,
- const long style, const wxString& name)
+bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
+ long style, const wxString& name)
{
m_imageList = NULL;
m_backgroundColour = wxColour(GetRValue(GetSysColor(COLOR_BTNFACE)),
- GetGValue(GetSysColor(COLOR_BTNFACE)), GetBValue(GetSysColor(COLOR_BTNFACE)));
+ GetGValue(GetSysColor(COLOR_BTNFACE)), GetBValue(GetSysColor(COLOR_BTNFACE)));
m_foregroundColour = *wxBLACK ;
- m_defaultForegroundColour = *wxBLACK ;
- m_defaultBackgroundColour = wxColour(GetRValue(GetSysColor(COLOR_BTNFACE)),
- GetGValue(GetSysColor(COLOR_BTNFACE)), GetBValue(GetSysColor(COLOR_BTNFACE)));
-
SetName(name);
int x = pos.x;
// Create the toolbar control.
HWND hWndTabCtrl = CreateWindowEx(0L, // No extended styles.
WC_TABCONTROL, // Class name for the tab control
- "", // No default text.
+ wxT(""), // No default text.
WS_CHILD | WS_BORDER | WS_VISIBLE | tabStyle, // Styles and defaults.
x, y, width, height, // Standard size and position.
(HWND) parent->GetHWND(), // Parent window
return TRUE;
}
-wxTabCtrl::~wxTabCtrl(void)
+wxTabCtrl::~wxTabCtrl()
{
UnsubclassWin();
}
-void wxTabCtrl::Command(wxCommandEvent& event)
+bool wxTabCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
{
-}
+ wxTabEvent event(wxEVT_NULL, m_windowId);
+ wxEventType eventType = wxEVT_NULL;
+ NMHDR* hdr1 = (NMHDR*) lParam;
+ switch ( hdr1->code )
+ {
+ case TCN_SELCHANGE:
+ eventType = wxEVT_COMMAND_TAB_SEL_CHANGED;
+ break;
-bool wxTabCtrl::MSWCommand(const WXUINT cmd, const WXWORD id)
-{
- return FALSE;
-}
+ case TCN_SELCHANGING:
+ eventType = wxEVT_COMMAND_TAB_SEL_CHANGING;
+ break;
-bool wxTabCtrl::MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam)
-{
- wxTabEvent event(0, m_windowId);
- int eventType = 0;
- NMHDR* hdr1 = (NMHDR*) lParam;
- switch ( hdr1->code )
- {
- case TCN_SELCHANGE:
- {
- eventType = wxEVT_COMMAND_TAB_SEL_CHANGED;
- event.SetInt( (int) LOWORD(wParam) ) ;
- break;
- }
- case TCN_SELCHANGING:
- {
- eventType = wxEVT_COMMAND_TAB_SEL_CHANGING;
- event.SetInt( (int) LOWORD(wParam) ) ;
- break;
- }
case TTN_NEEDTEXT:
{
// TODO
// if (tool->m_shortHelpString != "")
// ttText->lpszText = (char *) (const char *)tool->m_shortHelpString;
- return wxControl::MSWNotify(wParam, lParam);
- break;
}
- default :
- return wxControl::MSWNotify(wParam, lParam);
- break;
- }
+ default :
+ return wxControl::MSWOnNotify(idCtrl, lParam, result);
+ }
- event.SetEventObject( this );
- event.SetEventType(eventType);
+ event.SetEventObject( this );
+ event.SetEventType(eventType);
+ event.SetInt(idCtrl) ;
- if ( !ProcessEvent(event) )
- return FALSE;
- return TRUE;
+ return ProcessEvent(event);
}
// Responds to colour changes, and passes event on to children.
void wxTabCtrl::OnSysColourChanged(wxSysColourChangedEvent& event)
{
m_backgroundColour = wxColour(GetRValue(GetSysColor(COLOR_BTNFACE)),
- GetGValue(GetSysColor(COLOR_BTNFACE)), GetBValue(GetSysColor(COLOR_BTNFACE)));
- m_defaultBackgroundColour = wxColour(GetRValue(GetSysColor(COLOR_BTNFACE)),
- GetGValue(GetSysColor(COLOR_BTNFACE)), GetBValue(GetSysColor(COLOR_BTNFACE)));
-
- // Remap the buttons
-// CreateTools();
-
- Default();
+ GetGValue(GetSysColor(COLOR_BTNFACE)),
+ GetBValue(GetSysColor(COLOR_BTNFACE)));
Refresh();
}
// Delete all items
-bool wxTabCtrl::DeleteAllItems(void)
+bool wxTabCtrl::DeleteAllItems()
{
return ( TabCtrl_DeleteAllItems( (HWND) GetHWND() ) != FALSE );
}
// Delete an item
-bool wxTabCtrl::DeleteItem(const int item)
+bool wxTabCtrl::DeleteItem(int item)
{
return ( TabCtrl_DeleteItem( (HWND) GetHWND(), item) != FALSE );
}
// Get the selection
-int wxTabCtrl::GetSelection(void) const
+int wxTabCtrl::GetSelection() const
{
return (int) TabCtrl_GetCurSel( (HWND) GetHWND() );
}
+// Get the tab with the current keyboard focus
+int wxTabCtrl::GetCurFocus() const
+{
+ return (int) TabCtrl_GetCurFocus( (HWND) GetHWND() );
+}
+
// Get the associated image list
-wxImageList* wxTabCtrl::GetImageList(void) const
+wxImageList* wxTabCtrl::GetImageList() const
{
return m_imageList;
}
// Get the number of items
-int wxTabCtrl::GetItemCount(void) const
+int wxTabCtrl::GetItemCount() const
{
return (int) TabCtrl_GetItemCount( (HWND) GetHWND() );
}
// Get the rect corresponding to the tab
-bool wxTabCtrl::GetItemRect(const int item, wxRect& wxrect) const
+bool wxTabCtrl::GetItemRect(int item, wxRect& wxrect) const
{
RECT rect;
if ( !TabCtrl_GetItemRect( (HWND) GetHWND(), item, & rect) )
}
// Get the number of rows
-int wxTabCtrl::GetRowCount(void) const
+int wxTabCtrl::GetRowCount() const
{
return (int) TabCtrl_GetRowCount( (HWND) GetHWND() );
}
// Get the item text
-wxString wxTabCtrl::GetItemText(const int item) const
+wxString wxTabCtrl::GetItemText(int item) const
{
- char buf[256];
- wxString str("");
+ wxChar buf[256];
+ wxString str(wxT(""));
TC_ITEM tcItem;
tcItem.mask = TCIF_TEXT;
tcItem.pszText = buf;
}
// Get the item image
-int wxTabCtrl::GetItemImage(const int item) const
+int wxTabCtrl::GetItemImage(int item) const
{
TC_ITEM tcItem;
tcItem.mask = TCIF_IMAGE;
}
// Get the item data
-void* wxTabCtrl::GetItemData(const int item) const
+void* wxTabCtrl::GetItemData(int item) const
{
TC_ITEM tcItem;
tcItem.mask = TCIF_PARAM;
}
// Insert an item
-int wxTabCtrl::InsertItem(const int item, const wxString& text, const int imageId, void* data)
+bool wxTabCtrl::InsertItem(int item, const wxString& text, int imageId, void* data)
{
- char buf[256];
+ wxChar buf[256];
TC_ITEM tcItem;
tcItem.mask = TCIF_PARAM;
tcItem.lParam = (long) data;
- if (text != "")
+ if (text != wxT(""))
{
tcItem.mask |= TCIF_TEXT;
- strcpy(buf, (const char*) text);
+ wxStrcpy(buf, (const wxChar*) text);
tcItem.pszText = buf;
tcItem.cchTextMax = 256;
}
tcItem.iImage = imageId;
}
- return (int) TabCtrl_InsertItem( (HWND) GetHWND(), item, & tcItem);
+ return (TabCtrl_InsertItem( (HWND) GetHWND(), item, & tcItem) != -1);
}
// Set the selection
-int wxTabCtrl::SetSelection(const int item)
+int wxTabCtrl::SetSelection(int item)
{
return (int) TabCtrl_SetCurSel( (HWND) GetHWND(), item );
}
}
// Set the text for an item
-bool wxTabCtrl::SetItemText(const int item, const wxString& text)
+bool wxTabCtrl::SetItemText(int item, const wxString& text)
{
- char buf[256];
+ wxChar buf[256];
TC_ITEM tcItem;
tcItem.mask = TCIF_TEXT;
- strcpy(buf, (const char*) text);
+ wxStrcpy(buf, (const wxChar*) text);
tcItem.pszText = buf;
tcItem.cchTextMax = 256;
}
// Set the image for an item
-bool wxTabCtrl::SetItemImage(const int item, const int image)
+bool wxTabCtrl::SetItemImage(int item, int image)
{
TC_ITEM tcItem;
tcItem.mask = TCIF_IMAGE;
}
// Set the data for an item
-bool wxTabCtrl::SetItemData(const int item, void* data)
+bool wxTabCtrl::SetItemData(int item, void* data)
{
TC_ITEM tcItem;
tcItem.mask = TCIF_PARAM;
// Tab event
IMPLEMENT_DYNAMIC_CLASS(wxTabEvent, wxCommandEvent)
-wxTabEvent::wxTabEvent(WXTYPE commandType, int id):
+wxTabEvent::wxTabEvent(wxEventType commandType, int id):
wxCommandEvent(commandType, id)
{
}
projects / wxWidgets.git / blobdiff