merged 2.4 branch into the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		| @@ -40,14 +40,14 @@ public: | ||||
|              const wxPoint& pos = wxDefaultPosition, | ||||
|              const wxSize& size = wxDefaultSize, | ||||
|              long style = 0, | ||||
|              const wxString& name = "notebook"); | ||||
|              const wxString& name = wxNOTEBOOK_NAME); | ||||
|     // Create() function | ||||
|   bool Create(wxWindow *parent, | ||||
|               wxWindowID id, | ||||
|               const wxPoint& pos = wxDefaultPosition, | ||||
|               const wxSize& size = wxDefaultSize, | ||||
|               long style = 0, | ||||
|               const wxString& name = "notebook"); | ||||
|               const wxString& name = wxNOTEBOOK_NAME); | ||||
|  | ||||
|   // accessors | ||||
|   // --------- | ||||
| @@ -133,10 +133,8 @@ protected: | ||||
|   // remove one page from the notebook, without deleting | ||||
|   virtual wxNotebookPage *DoRemovePage(int nPage); | ||||
|  | ||||
|   // helper functions | ||||
|   void ChangePage(int nOldSel, int nSel); // change pages | ||||
|  | ||||
|   int m_nSelection;           // the current selection (-1 if none) | ||||
|   // the current selection (-1 if none) | ||||
|   int m_nSelection; | ||||
|  | ||||
|   DECLARE_DYNAMIC_CLASS(wxNotebook) | ||||
|   DECLARE_EVENT_TABLE() | ||||
|   | ||||
		Reference in New Issue
	
	Block a user