From 35eca07ccdca92126687b86c6d290f5b9b937422 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 7 Aug 1998 17:32:54 +0000 Subject: [PATCH] Removed a ">>>>>>> 1.5" (a CVS conflict indicator) that got left in the code. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/notebook.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h index 9b0af68f26..b3bcacf7be 100644 --- a/include/wx/msw/notebook.h +++ b/include/wx/msw/notebook.h @@ -40,7 +40,7 @@ WX_DEFINE_ARRAY(wxNotebookPage *, wxArrayPages); class WXDLLEXPORT wxNotebookEvent : public wxCommandEvent { public: - wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0, + wxNotebookEvent(wxEventType commandType = wxEVT_NULL, int id = 0, int nSel = -1, int nOldSel = -1) : wxCommandEvent(commandType, id) { m_nSel = nSel; m_nOldSel = nOldSel; } @@ -71,14 +71,14 @@ public: wxNotebook(); // the same arguments as for wxControl (@@@ any special styles?) wxNotebook(wxWindow *parent, - wxWindowID id, + wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "notebook"); // Create() function bool Create(wxWindow *parent, - wxWindowID id, + wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, @@ -155,8 +155,7 @@ public: void OnSelChange(wxNotebookEvent& event); void OnSetFocus(wxFocusEvent& event); void OnNavigationKey(wxNavigationKeyEvent& event); - ->>>>>>> 1.5 + // base class virtuals // ------------------- virtual void Command(wxCommandEvent& event); -- 2.47.2