cleanup - fixed warnings, reformatting

[wxWidgets.git] / include / wx / choicebk.h

diff --git a/include/wx/choicebk.h b/include/wx/choicebk.h
index 4423d095f65a4bb3c929e817629f56b167785bc9..6c215fc7645c10f27cbcd008e6d9fd77b261b09c 100644 (file)
--- a/include/wx/choicebk.h
+++ b/include/wx/choicebk.h
@@ -12,10 +12,6 @@
 #ifndef _WX_CHOICEBOOK_H_
 #define _WX_CHOICEBOOK_H_
 
 #ifndef _WX_CHOICEBOOK_H_
 #define _WX_CHOICEBOOK_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "choicebook.h"
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_CHOICEBOOK
 #include "wx/defs.h"
 
 #if wxUSE_CHOICEBOOK


@@ -71,30 +67,20 @@ public:
     virtual int SetSelection(size_t n);
     virtual void SetImageList(wxImageList *imageList);
 
     virtual int SetSelection(size_t n);
     virtual void SetImageList(wxImageList *imageList);
 

-    // returns true if we have wxCHB_TOP or wxCHB_BOTTOM style
-    bool IsVertical() const { return HasFlag(wxCHB_BOTTOM | wxCHB_TOP); }
-

     virtual bool DeleteAllPages();
 
     // returns the choice control
     virtual bool DeleteAllPages();
 
     // returns the choice control

-    wxChoice* GetChoiceCtrl() const { return m_choice; }
+    wxChoice* GetChoiceCtrl() const { return (wxChoice*)m_bookctrl; }

 
 protected:
     virtual wxWindow *DoRemovePage(size_t page);
 
     // get the size which the choice control should have
 
 protected:
     virtual wxWindow *DoRemovePage(size_t page);
 
     // get the size which the choice control should have

-    wxSize GetChoiceSize() const;
-
-    // get the page area
-    wxRect GetPageRect() const;
+    virtual wxSize GetControllerSize() const;

 
     // event handlers
 
     // event handlers

-    void OnSize(wxSizeEvent& event);

     void OnChoiceSelected(wxCommandEvent& event);
 
     void OnChoiceSelected(wxCommandEvent& event);
 

-    // the choice control we use for showing the pages index
-    wxChoice *m_choice;
-

     // the currently selected page or wxNOT_FOUND if none
     int m_selection;
 
     // the currently selected page or wxNOT_FOUND if none
     int m_selection;
 


@@ -119,8 +105,15 @@ public:
     {
     }
 
     {
     }
 

+    wxChoicebookEvent(const wxChoicebookEvent& event)
+        : wxBookCtrlBaseEvent(event)
+    {
+    }
+
+    virtual wxEvent *Clone() const { return new wxChoicebookEvent(*this); }
+

 private:
 private:

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxChoicebookEvent)
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxChoicebookEvent)

 };
 
 extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED;
 };
 
 extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED;