X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/510b9edbb6a614d42ac7697d0819d6720b774a19..c2651b0a5c407ceb1693a865ee19d3d57e147c97:/contrib/include/wx/fl/frmview.h?ds=sidebyside

diff --git a/contrib/include/wx/fl/frmview.h b/contrib/include/wx/fl/frmview.h
index d5b35235b9..7d339c3b8c 100644
--- a/contrib/include/wx/fl/frmview.h
+++ b/contrib/include/wx/fl/frmview.h
@@ -63,14 +63,14 @@ public:
     void CreateLayout();
     wxFrameLayout* GetLayout();
     void SetLayout( wxFrameLayout* pLayout );
-    void SetToolUpdates( bool doToolUpdates = TRUE );
+    void SetToolUpdates( bool doToolUpdates = true );
 
 
     // hooks for specific frame-views
 
     virtual void OnInit() {}
 
-    virtual void OnSerialize( wxObjectStorage& store ) {}
+    virtual void OnSerialize( wxObjectStorage& WXUNUSED(store) ) {}
     virtual void OnActiveate() {}
     virtual void OnDeactivate() {}
 
@@ -87,7 +87,7 @@ class wxFrame;
 It is not clear what this class does. It is not used elsewhere in FL.
 */
 
-class WXDLLIMPEXP_FL wxFrameManager : wxObject
+class WXDLLIMPEXP_FL wxFrameManager : public wxObject
 {
 protected:
     wxList       mViews;
@@ -114,7 +114,8 @@ public:
 
     // if file name is empty, views are are not saved/loaded
 
-    virtual void Init( wxWindow* pMainFrame, const wxString& settingsFile = "" );
+    virtual void Init( wxWindow* pMainFrame,
+                       const wxString& settingsFile = wxEmptyString );
 
     // synonyms
     wxFrame* GetParentFrame();
@@ -122,7 +123,7 @@ public:
 
     int GetActiveViewNo();
     wxFrameView* GetActiveView();
-    wxNode* GetActiveViewNode();
+    wxObjectList::compatibility_iterator GetActiveViewNode();
 
     wxFrameView* GetView( int viewNo );