X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c50f1fb9226d9260454ccb9c8a67d0be23c2827f..55c56a6d80f0ee4a4bf2add6ba1f62c02cbfc23e:/utils/wxPython/tests/test1.py

diff --git a/utils/wxPython/tests/test1.py b/utils/wxPython/tests/test1.py
index 16b35fdca8..5cc269d636 100644
--- a/utils/wxPython/tests/test1.py
+++ b/utils/wxPython/tests/test1.py
@@ -12,16 +12,7 @@
 #----------------------------------------------------------------------------
 
 
-<<<<<<< test1.py
-<<<<<<< test1.py
-#from wxPython import *
-from wxpc import *
-=======
-=======
-## import all of the wxPython GUI package
->>>>>>> 1.4
 from wxPython.wx import *
->>>>>>> 1.3
 
 #---------------------------------------------------------------------------
 
@@ -62,10 +53,7 @@ class MyFrame(wxFrame):
 #---------------------------------------------------------------------------
 
 
-<<<<<<< test1.py
-=======
 # Every wxWindows application must have a class derived from wxApp
->>>>>>> 1.4
 class MyApp(wxApp):
 
     # wxWindows calls this method to initialize the application
@@ -83,67 +71,13 @@ class MyApp(wxApp):
 
 #---------------------------------------------------------------------------
 
-<<<<<<< test1.py
 
-def main():
-    app = MyApp(0)
-    app.MainLoop()
-
-
-def t():
-    import pdb
-    pdb.run('main()')
-=======
->>>>>>> 1.4
-
-<<<<<<< test1.py
-if __name__ == '__main__':
-    main()
-=======
-app = MyApp(0)     # Create an instance of the application class
+app = MyApp(1)     # Create an instance of the application class
 app.MainLoop()     # Tell it to start processing events
->>>>>>> 1.4
 
 print 'done!'
 
 
 #----------------------------------------------------------------------------
-#
-# $Log$
-# Revision 1.6  1999/06/28 21:39:48  VZ
-# 1. wxStaticLine implemented (generic (ugly) and MSW versions)
-# 2. wxTextDialog looks fine under MSW again
-# 3. startup tips added: code, sample, docs
-# 4. read-only text controls don't participate in TAB traversal
-#
-# Revision 1.3  1998/12/15 20:44:34  RD
-# Changed the import semantics from "from wxPython import *" to "from
-# wxPython.wx import *"  This is for people who are worried about
-# namespace pollution, they can use "from wxPython import wx" and then
-# prefix all the wxPython identifiers with "wx."
-#
-# Added wxTaskbarIcon for wxMSW.
-#
-# Made the events work for wxGrid.
-#
-# Added wxConfig.
-#
-# Added wxMiniFrame for wxGTK, (untested.)
-#
-# Changed many of the args and return values that were pointers to gdi
-# objects to references to reflect changes in the wxWindows API.
-#
-<<<<<<< test1.py
-# Other assorted fixes and additions.
-#
-# Revision 1.2  1998/10/02 06:42:27  RD
-#
-# Version 0.4 of wxPython for MSW.
-#
-# Revision 1.1  1998/08/09 08:28:05  RD
-# Initial version
-#
-#
-=======
 
->>>>>>> 1.4
+