Make wxJoystick::GetNumberJoystick a static method, as the number of

[wxWidgets.git] / samples / richedit / wxLayout.h

diff --git a/samples/richedit/wxLayout.h b/samples/richedit/wxLayout.h
index d64cd7414943ccefb544624d82c9705b5665ad23..8d8a594bbb65756c516f0c222809c3cf50e3898d 100644 (file)
--- a/samples/richedit/wxLayout.h
+++ b/samples/richedit/wxLayout.h
@@ -3,10 +3,6 @@
 #ifndef __WXLAYOUTH__
 #define __WXLAYOUTH__
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "wx/wx.h"
 
 #include "wxllist.h"
@@ -26,14 +22,13 @@ class MyApp;
 
 class MyFrame: public wxFrame
 {
-  DECLARE_DYNAMIC_CLASS(MyFrame)
 
-  public:
-  
-   MyFrame(void);
-   void AddSampleText(wxLayoutList *llist);
-   void Clear(void);
-   void OnCommand( wxCommandEvent &event );
+public:
+
+    MyFrame();
+    void AddSampleText(wxLayoutList *llist);
+    void Clear();
+    void OnCommand( wxCommandEvent &event );
 
     void OnPrint(wxCommandEvent& event);
     void OnPrintPreview(wxCommandEvent& event);
@@ -44,11 +39,14 @@ class MyFrame: public wxFrame
     void OnPrintSetupPS(wxCommandEvent& event);
     void OnPageSetupPS(wxCommandEvent& event);
 
-   DECLARE_EVENT_TABLE()
 
 private:
-   wxLayoutWindow  *m_lwin;
-   wxPrintData m_PrintData;
+    wxLayoutWindow  *m_lwin;
+    wxPrintData m_PrintData;
+
+    DECLARE_DYNAMIC_CLASS(MyFrame)
+
+    DECLARE_EVENT_TABLE()
 };
 
 //-----------------------------------------------------------------------------
@@ -57,10 +55,13 @@ private:
 
 class MyApp: public wxApp
 {
-  public:
-  
-    MyApp(void);
-    virtual bool OnInit(void);
+public:
+
+    MyApp();
+
+    virtual bool OnInit();
+
 };
 
 #endif // __WXCONVERTH__
+