projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added wxUSE_PLOT
[wxWidgets.git]
/
include
/
wx
/
msw
/
tabctrl.h
diff --git
a/include/wx/msw/tabctrl.h
b/include/wx/msw/tabctrl.h
index 814f9cccf8b237a4634672f8c704e3d7770c7992..c193c9d44c3e7ae48ab34b4ae0faa213154f5eb4 100644
(file)
--- a/
include/wx/msw/tabctrl.h
+++ b/
include/wx/msw/tabctrl.h
@@
-5,12
+5,12
@@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
and Markus Holzem
-// Licence: wxWindows licen
s
e
+// Copyright: (c) Julian Smart
+// Licence: wxWindows licen
c
e
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-#ifndef _
_TABCTRLH_
_
-#define _
_TABCTRLH_
_
+#ifndef _
WX_TABCTRL_H
_
+#define _
WX_TABCTRL_H
_
#ifdef __GNUG__
#pragma interface "tabctrl.h"
#ifdef __GNUG__
#pragma interface "tabctrl.h"
@@
-18,7
+18,7
@@
class wxImageList;
class wxImageList;
-// WXDLLEXPORT_DATA(extern const
c
har*) wxToolBarNameStr;
+// WXDLLEXPORT_DATA(extern const
wxC
har*) wxToolBarNameStr;
/*
* Flags returned by HitTest
/*
* Flags returned by HitTest
@@
-37,55
+37,58
@@
class WXDLLEXPORT wxTabCtrl: public wxControl
* Public interface
*/
* Public interface
*/
- wxTabCtrl(
void
);
+ wxTabCtrl();
- inline wxTabCtrl(wxWindow *parent,
const
wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-
const
long style = 0, const wxString& name = "tabCtrl")
+ inline wxTabCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+ long style = 0, const wxString& name = "tabCtrl")
{
Create(parent, id, pos, size, style, name);
}
{
Create(parent, id, pos, size, style, name);
}
- ~wxTabCtrl(
void
);
+ ~wxTabCtrl();
// Accessors
// Get the selection
// Accessors
// Get the selection
- int GetSelection(void) const;
+ int GetSelection() const;
+
+ // Get the tab with the current keyboard focus
+ int GetCurFocus() const;
// Get the associated image list
// Get the associated image list
- wxImageList* GetImageList(
void
) const;
+ wxImageList* GetImageList() const;
// Get the number of items
// Get the number of items
- int GetItemCount(
void
) const;
+ int GetItemCount() const;
// Get the rect corresponding to the tab
// Get the rect corresponding to the tab
- bool GetItemRect(
const
int item, wxRect& rect) const;
+ bool GetItemRect(int item, wxRect& rect) const;
// Get the number of rows
// Get the number of rows
- int GetRowCount(
void
) const;
+ int GetRowCount() const;
// Get the item text
// Get the item text
- wxString GetItemText(
const
int item) const ;
+ wxString GetItemText(int item) const ;
// Get the item image
// Get the item image
- int GetItemImage(
const
int item) const;
+ int GetItemImage(int item) const;
// Get the item data
// Get the item data
- void* GetItemData(
const
int item) const;
+ void* GetItemData(int item) const;
// Set the selection
// Set the selection
- int SetSelection(
const
int item);
+ int SetSelection(int item);
// Set the image list
void SetImageList(wxImageList* imageList);
// Set the text for an item
// Set the image list
void SetImageList(wxImageList* imageList);
// Set the text for an item
- bool SetItemText(
const
int item, const wxString& text);
+ bool SetItemText(int item, const wxString& text);
// Set the image for an item
// Set the image for an item
- bool SetItemImage(
const int item, const
int image);
+ bool SetItemImage(
int item,
int image);
// Set the data for an item
// Set the data for an item
- bool SetItemData(
const
int item, void* data);
+ bool SetItemData(int item, void* data);
// Set the size for a fixed-width tab control
void SetItemSize(const wxSize& size);
// Set the size for a fixed-width tab control
void SetItemSize(const wxSize& size);
@@
-95,32
+98,24
@@
class WXDLLEXPORT wxTabCtrl: public wxControl
// Operations
// Operations
- bool Create(wxWindow *parent,
const
wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-
const
long style = 0, const wxString& name = "tabCtrl");
+ bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+ long style = 0, const wxString& name = "tabCtrl");
// Delete all items
// Delete all items
- bool DeleteAllItems(
void
);
+ bool DeleteAllItems();
// Delete an item
// Delete an item
- bool DeleteItem(
const
int item);
+ bool DeleteItem(int item);
// Hit test
int HitTest(const wxPoint& pt, long& flags);
// Insert an item
// Hit test
int HitTest(const wxPoint& pt, long& flags);
// Insert an item
- int InsertItem(const int item, const wxString& text, const int imageId = -1, void* data = NULL);
-
-// Implementation
+ bool InsertItem(int item, const wxString& text, int imageId = -1, void* data = NULL);
- // Call default behaviour
- void OnPaint(wxPaintEvent& event) { Default() ; }
- void OnSize(wxSizeEvent& event) { Default() ; }
- void OnMouseEvent(wxMouseEvent& event) { Default() ; }
- void OnKillFocus(wxFocusEvent& event) { Default() ; }
+ // Implementation
- void Command(wxCommandEvent& event);
- bool MSWCommand(const WXUINT param, const WXWORD id);
- bool MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam);
+ virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
// Responds to colour changes
void OnSysColourChanged(wxSysColourChangedEvent& event);
// Responds to colour changes
void OnSysColourChanged(wxSysColourChangedEvent& event);
@@
-136,7
+131,7
@@
class WXDLLEXPORT wxTabEvent: public wxCommandEvent
DECLARE_DYNAMIC_CLASS(wxTabEvent)
public:
DECLARE_DYNAMIC_CLASS(wxTabEvent)
public:
- wxTabEvent(
WXTYPE commandType = 0
, int id = 0);
+ wxTabEvent(
wxEventType commandType = wxEVT_NULL
, int id = 0);
};
typedef void (wxEvtHandler::*wxTabEventFunction)(wxTabEvent&);
};
typedef void (wxEvtHandler::*wxTabEventFunction)(wxTabEvent&);
@@
-147,4
+142,4
@@
typedef void (wxEvtHandler::*wxTabEventFunction)(wxTabEvent&);
id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTabEventFunction) & fn, NULL },
#endif
id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTabEventFunction) & fn, NULL },
#endif
- // _
_TABCTRLH_
_
+ // _
WX_TABCTRL_H
_