Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed a ">>>>>>> 1.5" (a CVS conflict indicator) that got left in

Browse Source 
the code.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1998-08-07 17:32:54 +00:00
parent b5279053f6
commit 35eca07ccd
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/msw/notebook.h
View File

@@ -40,7 +40,7 @@ WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayPages);
class WXDLLEXPORT wxNotebookEvent : public wxCommandEvent class WXDLLEXPORT wxNotebookEvent : public wxCommandEvent
{ {
public: public:
wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0, wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0,
int nSel = -1, int nOldSel = -1) int nSel = -1, int nOldSel = -1)
: wxCommandEvent(commandType, id) { m_nSel = nSel; m_nOldSel = nOldSel; } : wxCommandEvent(commandType, id) { m_nSel = nSel; m_nOldSel = nOldSel; }
@@ -71,14 +71,14 @@ public:
wxNotebook(); wxNotebook();
// the same arguments as for wxControl (@@@ any special styles?) // the same arguments as for wxControl (@@@ any special styles?)
wxNotebook(wxWindow *parent, wxNotebook(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxString& name = "notebook"); const wxString& name = "notebook");
// Create() function // Create() function
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
@@ -155,8 +155,7 @@ public:
void OnSelChange(wxNotebookEvent& event); void OnSelChange(wxNotebookEvent& event);
void OnSetFocus(wxFocusEvent& event); void OnSetFocus(wxFocusEvent& event);
void OnNavigationKey(wxNavigationKeyEvent& event); void OnNavigationKey(wxNavigationKeyEvent& event);
>>>>>>> 1.5
// base class virtuals // base class virtuals
// ------------------- // -------------------
virtual void Command(wxCommandEvent& event); virtual void Command(wxCommandEvent& event);