Renamed demo modules to be wx-less.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25064 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/demo/ColourDB.py

@@ -141,8 +141,8 @@ class TestWindow(wx.ScrolledWindow):
         dc.EndDrawing()
 
 
-# On wxGTK there needs to be a panel under wxScrolledWindows if they are
+# On wxGTK there needs to be a panel under wx.ScrolledWindows if they are
-# going to be in a wxNotebook. And, in the demo, we are.
+# going to be in a wxNotebook. And, in this demo, we are.
 class TestPanel(wx.Panel):
     def __init__(self, parent):
         wx.Panel.__init__(self, parent, -1)

wxPython/demo/MDIDemo.py

@@ -8,9 +8,9 @@
 
 import  wx
 
-# Importing wxScrolledWindow demo to make use of the MyCanvas 
+# Importing ScrolledWindow demo to make use of the MyCanvas 
 # class defined within.
-import  wxScrolledWindow 
+import  ScrolledWindow 
 import  images
 
 SHOW_BACKGROUND = 1
@@ -53,7 +53,7 @@ class MyParentFrame(wx.MDIParentFrame):
     def OnNewWindow(self, evt):
         self.winCount = self.winCount + 1
         win = wx.MDIChildFrame(self, -1, "Child Window: %d" % self.winCount)
-        canvas = wxScrolledWindow.MyCanvas(win)
+        canvas = ScrolledWindow.MyCanvas(win)
         win.Show(True)
 
 

wxPython/demo/MDISashDemo.py

@@ -7,7 +7,7 @@
 
 import wx
 
-import wxScrolledWindow
+import ScrolledWindow
 
 #----------------------------------------------------------------------
 # There are better ways to do IDs, but this demo requires that the window
@@ -135,7 +135,7 @@ class MyParentFrame(wx.MDIParentFrame):
     def OnNewWindow(self, evt):
         self.winCount = self.winCount + 1
         win = wx.MDIChildFrame(self, -1, "Child Window: %d" % self.winCount)
-        canvas = wxScrolledWindow.MyCanvas(win)
+        canvas = ScrolledWindow.MyCanvas(win)
         win.Show(True)
 
 

wxPython/demo/Main.py

@@ -29,154 +29,154 @@ import images
 _treeList = [
     # new stuff
     ('Recent Additions', [
-        'wxVListBox',
+        'VListBox',
-        'wxListbook',
+        'Listbook',
-        'wxMaskedNumCtrl',
+        'MaskedNumCtrl',
         'FloatCanvas',
-        'wxXmlResourceSubclass',
+        'XmlResourceSubclass',
-        'wxGridBagSizer',
+        'GridBagSizer',
         'Cursor',
         'PyPlot',
         ]),
 
     # managed windows == things with a (optional) caption you can close
     ('Base Frames and Dialogs', [
-        'wxDialog',
+        'Dialog',
-        'wxFrame',
+        'Frame',
-        'wxMDIWindows',
+        'MDIWindows',
-        'wxMiniFrame',
+        'MiniFrame',
-        'wxWizard',
+        'Wizard',
         ]),
 
     # the common dialogs
     ('Common Dialogs', [
-        'wxColourDialog',
+        'ColourDialog',
-        'wxDirDialog',
+        'DirDialog',
-        'wxFileDialog',
+        'FileDialog',
-        'wxFileDialog_Save',
+        'FileDialog_Save',
-        'wxFindReplaceDialog',
+        'FindReplaceDialog',
-        'wxFontDialog',
+        'FontDialog',
-        'wxMessageDialog',
+        'MessageDialog',
-        'wxPageSetupDialog',
+        'PageSetupDialog',
-        'wxPrintDialog',
+        'PrintDialog',
-        'wxProgressDialog',
+        'ProgressDialog',
-        'wxSingleChoiceDialog',
+        'SingleChoiceDialog',
-        'wxTextEntryDialog',
+        'TextEntryDialog',
         ]),
 
     # dialogs from libraries
     ('More Dialogs', [
         'ErrorDialogs',
         'ImageBrowser',
-        'wxMultipleChoiceDialog',
+        'MultipleChoiceDialog',
-        'wxScrolledMessageDialog',
+        'ScrolledMessageDialog',
         ]),
 
     # core controls
     ('Core Windows/Controls', [
+        'Button',
+        'CheckBox',
+        'CheckListBox',
+        'Choice',
+        'ComboBox',
+        'Gauge',
+        'Grid',
+        'Grid_MegaExample',
+        'ListBox',
+        'ListCtrl',
+        'ListCtrl_virtual',
+        'Listbook',
+        'Menu',
+        'Notebook',
         'PopupMenu',
-        'wxButton',
+        'PopupWindow',
-        'wxCheckBox',
+        'RadioBox',
-        'wxCheckListBox',
+        'RadioButton',
-        'wxChoice',
+        'SashWindow',
-        'wxComboBox',
+        'ScrolledWindow',
-        'wxGauge',
+        'Slider',
-        'wxGrid',
+        'SpinButton',
-        'wxGrid_MegaExample',
+        'SpinCtrl',
-        'wxListbook',
+        'SplitterWindow',
-        'wxListBox',
+        'StaticBitmap',
-        'wxListCtrl',
+        'StaticText',
-        'wxListCtrl_virtual',
+        'StatusBar',
-        'wxMenu',
+        'TextCtrl',
-        'wxNotebook',
+        'ToggleButton',
-        'wxPopupWindow',
+        'ToolBar',
-        'wxRadioBox',
+        'TreeCtrl',
-        'wxRadioButton',
+        'Validator',
-        'wxSashWindow',
-        'wxScrolledWindow',
-        'wxSlider',
-        'wxSpinButton',
-        'wxSpinCtrl',
-        'wxSplitterWindow',
-        'wxStaticBitmap',
-        'wxStaticText',
-        'wxStatusBar',
-        'wxTextCtrl',
-        'wxToggleButton',
-        'wxToolBar',
-        'wxTreeCtrl',
-        'wxValidator',
         ]),
 
     ('Custom Controls', [
         'AnalogClockWindow',
         'ColourSelect',
+        'Editor',
         'GenericButtons',
-        'wxEditor',
+        'GenericDirCtrl',
-        'wxGenericDirCtrl',
+        'LEDNumberCtrl',
-        'wxLEDNumberCtrl',
+        'MultiSash',
-        'wxMultiSash',
+        'PopupControl',
-        'wxPopupControl',
+        'PyColourChooser',
-        'wxPyColourChooser',
+        'TreeListCtrl',
-        'wxTreeListCtrl',
     ]),
     
     # controls coming from other libraries
     ('More Windows/Controls', [
-        #'wxFloatBar',          deprecated
+        #'RightTextCtrl',     deprecated as we have wxTE_RIGHT now.
-        #'wxMVCTree',           deprecated
+        'Calendar',
-        #'wxRightTextCtrl',     deprecated as we have wxTE_RIGHT now.
+        'CalendarCtrl',
         'ContextHelp',
+        'DynamicSashWindow',
+        'EditableListBox',
         'FancyText',
-        'FloatCanvas',
         'FileBrowseButton',
+        'FloatBar',  
+        'FloatCanvas',
+        'HtmlWindow',
+        'IEHtmlWin',
+        'IntCtrl',
+        'MVCTree',   
         'MaskedEditControls',
-        'PyShell',
+        'MaskedNumCtrl',
+        'MimeTypesManager',
         'PyCrust',
         'PyPlot',
+        'PyShell',
+        'ScrolledPanel',
         'SplitTree',
+        'StyledTextCtrl_1',
+        'StyledTextCtrl_2',
         'TablePrint',
         'Throbber',
-        'wxCalendar',
+        'TimeCtrl',
-        'wxCalendarCtrl',
+        'VListBox',
-        'wxDynamicSashWindow',
-        'wxEditableListBox',
-        'wxHtmlWindow',
-        'wxIEHtmlWin',
-        'wxIntCtrl',
-        'wxMimeTypesManager',
-        'wxMaskedNumCtrl',
-        'wxScrolledPanel',
-        'wxStyledTextCtrl_1',
-        'wxStyledTextCtrl_2',
-        'wxTimeCtrl',
-        'wxVListBox',
         ]),
 
     # How to lay out the controls in a frame/dialog
     ('Window Layout', [
+        'GridBagSizer',
         'LayoutAnchors',
+        'LayoutConstraints',
         'Layoutf',
         'RowColSizer',
+        'ScrolledPanel',
         'Sizers',
-        'wxGridBagSizer',
+        'XmlResource',
-        'wxLayoutConstraints',
+        'XmlResourceHandler',
-        'wxScrolledPanel',
+        'XmlResourceSubclass',
-        'wxXmlResource',
-        'wxXmlResourceHandler',
-        'wxXmlResourceSubclass',
         ]),
 
     # ditto
     ('Process and Events', [
         'EventManager',
-        'infoframe',
+        'KeyEvents',
         'OOR',
+        'Process',
         'PythonEvents',
         'Threads',
-        'wxKeyEvents',
+        'Timer',
-        'wxProcess',
+        'infoframe',
-        'wxTimer',
         ]),
 
     # Clipboard and DnD
@@ -188,13 +188,13 @@ _treeList = [
 
     # Images
     ('Using Images', [
+        'ArtProvider',
         'Cursor',
+        'DragImage',
+        'Image',
+        'ImageFromStream',
+        'Mask',
         'Throbber',
-        'wxArtProvider',
-        'wxDragImage',
-        'wxImage',
-        'wxImageFromStream',
-        'wxMask',
         ]),
 
     # Other stuff
@@ -202,24 +202,24 @@ _treeList = [
         'ColourDB',
         'DialogUnits',
         'DrawXXXList',
+        'FileHistory',
         'FontEnumerator',
+        'Joystick',
         'NewNamespace',
+        'OGL',
         'PrintFramework',
         'ShapedWindow',
         'Throbber',
         'Unicode',
-        'wxFileHistory',
+        'Wave',
-        'wxJoystick',
-        'wxOGL',
-        'wxWave',
         ]),
 
     # need libs not coming with the demo
     ('Objects using an external library', [
         'ActiveXWrapper_Acrobat',
         'ActiveXWrapper_IE',
-        'wxGLCanvas',
+        'GLCanvas',
-        #'wxPlotCanvas', # deprecated, use PyPlot
+        #'PlotCanvas', # deprecated, use PyPlot
         ]),
 
 
@@ -253,14 +253,14 @@ class MyTP(wx.PyTipProvider):
 
 #---------------------------------------------------------------------------
 # A class to be used to display source code in the demo.  Try using the
-# wxSTC in the wxStyledTextCtrl_2 sample first, fall back to wxTextCtrl
+# wxSTC in the StyledTextCtrl_2 sample first, fall back to wxTextCtrl
 # if there is an error, such as the stc module not being present.
 #
 
 try:
     ##raise ImportError
     from wx import stc
-    from wxStyledTextCtrl_2 import PythonSTC
+    from StyledTextCtrl_2 import PythonSTC
     class DemoCodeViewer(PythonSTC):
         def __init__(self, parent, ID):
             PythonSTC.__init__(self, parent, ID)

wxPython/demo/Mask.py

@@ -95,7 +95,7 @@ class TestMaskWindow(wx.ScrolledWindow):
             i = i + 1
 
 
-# On wxGTK there needs to be a panel under wxScrolledWindows if they are
+# On wxGTK there needs to be a panel under wx.ScrolledWindows if they are
 # going to be in a wxNotebook...
 class TestPanel(wx.Panel):
     def __init__(self, parent, ID):

wxPython/demo/Notebook.py

@@ -9,8 +9,8 @@ import  wx
 
 import  ColorPanel
 import  GridSimple
-import  wxListCtrl
+import  ListCtrl
-import  wxScrolledWindow
+import  ScrolledWindow
 import  images
 
 #----------------------------------------------------------------------------
@@ -49,7 +49,7 @@ class TestNB(wx.Notebook):
         win = self.makeColorPanel(wx.RED)
         self.AddPage(win, "Red")
 
-        win = wxScrolledWindow.MyCanvas(self)
+        win = ScrolledWindow.MyCanvas(self)
         self.AddPage(win, 'ScrolledWindow')
 
         win = self.makeColorPanel(wx.GREEN)
@@ -58,7 +58,7 @@ class TestNB(wx.Notebook):
         win = GridSimple.SimpleGrid(self, log)
         self.AddPage(win, "Grid")
 
-        win = wxListCtrl.TestListCtrlPanel(self, log)
+        win = ListCtrl.TestListCtrlPanel(self, log)
         self.AddPage(win, 'List')
 
         win = self.makeColorPanel(wx.CYAN)

wxPython/demo/PrintFramework.py

@@ -6,7 +6,7 @@
 #
 
 import  wx
-import  wxScrolledWindow
+import  ScrolledWindow
 
 #----------------------------------------------------------------------
 
@@ -108,7 +108,7 @@ class TestPrintPanel(wx.Panel):
         self.printData.SetPaperId(wx.PAPER_LETTER)
 
         self.box = wx.BoxSizer(wx.VERTICAL)
-        self.canvas = wxScrolledWindow.MyCanvas(self)
+        self.canvas = ScrolledWindow.MyCanvas(self)
         self.box.Add(self.canvas, 1, wx.GROW)
 
         subbox = wx.BoxSizer(wx.HORIZONTAL)

wxPython/demo/ScrolledPanel.py

@@ -30,7 +30,7 @@ class TestPanel(scrolled.ScrolledPanel):
 
         vbox = wx.BoxSizer(wx.VERTICAL)
         desc = wx.StaticText(self, -1,
-                            "ScrolledPanel extends wxScrolledWindow, adding all "
+                            "ScrolledPanel extends wx.ScrolledWindow, adding all "
                             "the necessary bits to set up scroll handling for you.\n\n"
                             "Here are three fixed size examples of its use. The "
                             "demo panel for this sample is also using it -- the \nwxStaticLine"
@@ -118,9 +118,9 @@ def runTest(frame, nb, log):
 
 
 overview = """<html><body>
-ScrolledPanel fills a "hole" in the implementation of wxScrolledWindow,
+ScrolledPanel fills a "hole" in the implementation of wx.ScrolledWindow,
 providing automatic scrollbar and scrolling behavior and the tab traversal
-mangement that wxScrolledWindow lacks.
+mangement that wx.ScrolledWindow lacks.
 </body></html>
 """
 

wxPython/demo/ScrolledWindow.py

@@ -199,7 +199,7 @@ class MyCanvas(wx.ScrolledWindow):
 
 
 ## This is an example of what to do for the EVT_MOUSEWHEEL event,
-## but since wxScrolledWindow does this already it's not
+## but since wx.ScrolledWindow does this already it's not
 ## necessary to do it ourselves. You would need to add an event table 
 ## entry to __init__() to direct wheelmouse events to this handler.
 

wxPython/demo/XmlResourceSubclass.py

@@ -15,7 +15,7 @@ resourceText = r'''<?xml version="1.0"?>
      subclass is specified as "moduleName.ClassName"  Try changing
      the classname to one that does not exist and see what happens -->
 
-<object class="wxPanel" subclass="wxXmlResourceSubclass.MyBluePanel" name="MyPanel">
+<object class="wxPanel" subclass="XmlResourceSubclass.MyBluePanel" name="MyPanel">
     <size>200,100</size>
     <object class="wxStaticText" name="label1">
         <label>This blue panel is a class derived from wxPanel
@@ -31,8 +31,8 @@ and is loaded by a using a subclass attribute of the object tag.</label>
 class MyBluePanel(wx.Panel):
     def __init__(self):
         p = wx.PrePanel()
+        # the Create step is done by XRC.
         self.PostCreate(p)
-
         self.Bind(wx.EVT_WINDOW_CREATE, self.OnCreate)
         
     def OnCreate(self, evt):