Include wx/containr.h according to precompiled headers of wx/wx.h (with other minor...

[wxWidgets.git] / samples / mobile / wxedit / wxedit.h

diff --git a/samples/mobile/wxedit/wxedit.h b/samples/mobile/wxedit/wxedit.h
index 1d4ea9c79bf32785e23e20f86d1a9d5a2cf4fd23..40a80f13bb57f20cf3afd33f6bd579e0df1cd285 100644 (file)
--- a/samples/mobile/wxedit/wxedit.h
+++ b/samples/mobile/wxedit/wxedit.h
@@ -1,20 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wxedit.h
 // Author:      Robert Roebling
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wxedit.h
 // Author:      Robert Roebling

+// RCS-ID:      $Id$

 // Created:     04/07/02
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __wxedit_H__
 #define __wxedit_H__
 
 // Created:     04/07/02
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __wxedit_H__
 #define __wxedit_H__
 

-#ifdef __GNUG__
-    #pragma interface "wxedit.cpp"
-#endif
-
-// Include wxWindows' headers
+// Include wxWidgets' headers

 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP

-    #include <wx/wx.h>
+    #include "wx/wx.h"

 #endif
 
 //----------------------------------------------------------------------------
 #endif
 
 //----------------------------------------------------------------------------


@@ -50,15 +47,15 @@ public:
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = wxDEFAULT_FRAME_STYLE );
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = wxDEFAULT_FRAME_STYLE );

-    
+

 private:
     void CreateMyMenuBar();
 private:
     void CreateMyMenuBar();

-    
+

 private:
     wxTextCtrl     *m_text;
     wxString        m_filename;
     wxArrayString   m_history;
 private:
     wxTextCtrl     *m_text;
     wxString        m_filename;
     wxArrayString   m_history;

-    
+

 private:
     void OnAbout( wxCommandEvent &event );
     void OnNew( wxCommandEvent &event );
 private:
     void OnAbout( wxCommandEvent &event );
     void OnNew( wxCommandEvent &event );


@@ -66,23 +63,23 @@ private:
     void OnSave( wxCommandEvent &event );
     void OnSaveAs( wxCommandEvent &event );
     void OnQuit( wxCommandEvent &event );
     void OnSave( wxCommandEvent &event );
     void OnSaveAs( wxCommandEvent &event );
     void OnQuit( wxCommandEvent &event );

-    
+

     void OnCopy( wxCommandEvent &event );
     void OnCut( wxCommandEvent &event );
     void OnPaste( wxCommandEvent &event );
     void OnDelete( wxCommandEvent &event );
     void OnCopy( wxCommandEvent &event );
     void OnCut( wxCommandEvent &event );
     void OnPaste( wxCommandEvent &event );
     void OnDelete( wxCommandEvent &event );

-    
+

     void OnLastFiles( wxCommandEvent &event );
     void OnLastFiles( wxCommandEvent &event );

-    
+

     void MakeHistory();
     void AddToHistory( const wxString &fname );
     void MakeHistory();
     void AddToHistory( const wxString &fname );

-    
+

     bool Save();
     bool Discard();
     bool Save();
     bool Discard();

-    
+

     void OnUpdateUI( wxUpdateUIEvent &event );
     void OnCloseWindow( wxCloseEvent &event );
     void OnUpdateUI( wxUpdateUIEvent &event );
     void OnCloseWindow( wxCloseEvent &event );

-    
+

 private:
     DECLARE_EVENT_TABLE()
 };
 private:
     DECLARE_EVENT_TABLE()
 };


@@ -94,8 +91,8 @@ private:
 class MyApp: public wxApp
 {
 public:
 class MyApp: public wxApp
 {
 public:

-    MyApp();
-    
+    MyApp(){};
+

     virtual bool OnInit();
     virtual int OnExit();
 };
     virtual bool OnInit();
     virtual int OnExit();
 };