Doesn't conform to license conditions, so removing

[wxWidgets.git] / contrib / include / wx / fl / frmview.h

diff --git a/contrib/include/wx/fl/frmview.h b/contrib/include/wx/fl/frmview.h
index 8830ab8e0adb53e09b2d1d6cbf1fd41cde506848..7d339c3b8ce9b1510dc4a0b394dbb39684271b91 100644 (file)
--- a/contrib/include/wx/fl/frmview.h
+++ b/contrib/include/wx/fl/frmview.h
@@ -32,7 +32,7 @@ class wxFrameManager;
 It is not clear what this class does. It is not used elsewhere in FL.
 */
 
 It is not clear what this class does. It is not used elsewhere in FL.
 */
 

-class wxFrameView : public wxEvtHandler
+class WXDLLIMPEXP_FL wxFrameView : public wxEvtHandler

 {
 protected:
     wxStringList    mTopMenus;
 {
 protected:
     wxStringList    mTopMenus;


@@ -63,14 +63,14 @@ public:
     void CreateLayout();
     wxFrameLayout* GetLayout();
     void SetLayout( wxFrameLayout* pLayout );
     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() {}
 
 
 
     // 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() {}
 
     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.
 */
 
 It is not clear what this class does. It is not used elsewhere in FL.
 */
 

-class wxFrameManager : wxObject
+class WXDLLIMPEXP_FL wxFrameManager : public wxObject

 {
 protected:
     wxList       mViews;
 {
 protected:
     wxList       mViews;


@@ -114,7 +114,8 @@ public:
 
     // if file name is empty, views are are not saved/loaded
 
 
     // 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();
 
     // synonyms
     wxFrame* GetParentFrame();


@@ -122,7 +123,7 @@ public:
 
     int GetActiveViewNo();
     wxFrameView* GetActiveView();
 
     int GetActiveViewNo();
     wxFrameView* GetActiveView();

-    wxNode* GetActiveViewNode();
+    wxObjectList::compatibility_iterator GetActiveViewNode();

 
     wxFrameView* GetView( int viewNo );
 
 
     wxFrameView* GetView( int viewNo );