[ 1578466 ] Support for custom floating panes

[wxWidgets.git] / contrib / samples / fl / fl_demo1.h

diff --git a/contrib/samples/fl/fl_demo1.h b/contrib/samples/fl/fl_demo1.h
index 70675acf2446b3a0f03e1f4ea6ddcb551c5f2a1d..79626d53387cea912650a907b1f42620a93f0e83 100644 (file)
--- a/contrib/samples/fl/fl_demo1.h
+++ b/contrib/samples/fl/fl_demo1.h
@@ -12,55 +12,52 @@
 #ifndef __NEW_TEST_G__
 #define __NEW_TEST_G__
 
 #ifndef __NEW_TEST_G__
 #define __NEW_TEST_G__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "fl_demo1.h"
-#endif
-

 #define NEW_TEST_SAVE 1101
 #define NEW_TEST_LOAD 1102
 #define NEW_TEST_EXIT 1103
 
 #include "wx/panel.h"
 #define NEW_TEST_SAVE 1101
 #define NEW_TEST_LOAD 1102
 #define NEW_TEST_EXIT 1103
 
 #include "wx/panel.h"

-#include "wx/statline.h"    
+#include "wx/statline.h"

 
 // Define a new application type
 class MyApp: public wxApp
 
 // Define a new application type
 class MyApp: public wxApp

-{ 
+{

 public:
     bool OnInit(void);
 };
 
 // Define a new frame type
 class MyFrame: public wxFrame
 public:
     bool OnInit(void);
 };
 
 // Define a new frame type
 class MyFrame: public wxFrame

-{ 
+{

 public:
     wxFrameLayout*  mpLayout;
     wxTextCtrl*     mpClientWnd;
 public:
     wxFrameLayout*  mpLayout;
     wxTextCtrl*     mpClientWnd;

-    
+

     wxTextCtrl* CreateTextCtrl( const wxString& value );
     wxTextCtrl* CreateTextCtrl( const wxString& value );

-    
+

 public:
     MyFrame(wxFrame *frame);
     virtual ~MyFrame();
 public:
     MyFrame(wxFrame *frame);
     virtual ~MyFrame();

-    
+

     bool OnClose(void) { Show(false); return true; }
     bool OnClose(void) { Show(false); return true; }

-    
+

     void OnLoad( wxCommandEvent& event );
     void OnSave( wxCommandEvent& event );
     void OnExit( wxCommandEvent& event );
     void OnLoad( wxCommandEvent& event );
     void OnSave( wxCommandEvent& event );
     void OnExit( wxCommandEvent& event );

-    
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

+#if wxUSE_STATLINE

 /*
  * Quick example of your own Separator class...
  */
 class wxMySeparatorLine : public wxStaticLine
 {
 public:
 /*
  * Quick example of your own Separator class...
  */
 class wxMySeparatorLine : public wxStaticLine
 {
 public:

-    wxMySeparatorLine() 
+    wxMySeparatorLine()

     {}
     {}

-    wxMySeparatorLine( wxWindow *parent, wxWindowID id) 
+    wxMySeparatorLine( wxWindow *parent, wxWindowID id)

         : wxStaticLine( parent, id)
     {}
 
         : wxStaticLine( parent, id)
     {}
 


@@ -69,6 +66,7 @@ protected:
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 };
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 };

+#endif // wxUSE_STATLINE

 
 #endif
 
 
 #endif