X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e87269a7a525bcd16b54544d8cc33624d04425df..1d21855083920c136002fbd9a283def320cd1c53:/wxPython/demo/Main.py?ds=sidebyside diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py index 8c7b09d699..a3b065e521 100644 --- a/wxPython/demo/Main.py +++ b/wxPython/demo/Main.py @@ -11,61 +11,104 @@ # Licence: wxWindows license #---------------------------------------------------------------------------- -import sys, os +import sys, os, time from wxPython.wx import * from wxPython.lib.splashscreen import SplashScreen from wxPython.html import wxHtmlWindow +import images + #--------------------------------------------------------------------------- _treeList = [ - ('New since last release', ['LayoutAnchors', "FancyText", + ('New since last release', ['ContextHelp', + 'PyCrust', + 'PyCrustWithFilling', + 'VirtualListCtrl', + 'wxListCtrl', + 'TablePrint', + 'OOR', + 'wxFindReplaceDialog', + 'DrawXXXList', + 'ErrorDialogs', + 'wxRightTextCtrl', + 'URLDragAndDrop', + 'wxMimeTypesManager', + 'wxPopupWindow', + 'wxDynamicSashWindow', + 'wxEditableListBox', ]), - ('Managed Windows', ['wxFrame', 'wxDialog', 'wxMiniFrame']), - - ('Non-Managed Windows', ['wxGrid', 'wxSashWindow', - 'wxScrolledWindow', 'wxSplitterWindow', - 'wxStatusBar', 'wxNotebook', - 'wxHtmlWindow', - 'wxStyledTextCtrl_1', 'wxStyledTextCtrl_2',]), + ('Windows', ['wxFrame', 'wxDialog', 'wxMiniFrame', + 'wxGrid', 'wxSashWindow', + 'wxScrolledWindow', 'wxSplitterWindow', + 'wxStatusBar', 'wxNotebook', + 'wxHtmlWindow', + 'wxStyledTextCtrl_1', 'wxStyledTextCtrl_2', + 'wxPopupWindow', + 'wxDynamicSashWindow', + ]), ('Common Dialogs', ['wxColourDialog', 'wxDirDialog', 'wxFileDialog', 'wxSingleChoiceDialog', 'wxTextEntryDialog', 'wxFontDialog', 'wxPageSetupDialog', 'wxPrintDialog', - 'wxMessageDialog', 'wxProgressDialog']), + 'wxMessageDialog', 'wxProgressDialog', 'wxFindReplaceDialog', + ]), ('Controls', ['wxButton', 'wxCheckBox', 'wxCheckListBox', 'wxChoice', 'wxComboBox', 'wxGauge', 'wxListBox', 'wxListCtrl', 'wxTextCtrl', 'wxTreeCtrl', 'wxSpinButton', 'wxSpinCtrl', 'wxStaticText', 'wxStaticBitmap', 'wxRadioBox', 'wxSlider', 'wxToolBar', - 'wxCalendarCtrl', + 'wxCalendarCtrl', 'wxToggleButton', + 'wxEditableListBox', ]), - ('Window Layout', ['wxLayoutConstraints', 'LayoutAnchors', 'Sizers', ]), + ('Window Layout', ['wxLayoutConstraints', 'LayoutAnchors', 'Sizers', 'XML_Resource']), - ('Miscellaneous', [ 'DragAndDrop', 'CustomDragAndDrop', 'FontEnumerator', + ('Miscellaneous', [ 'DragAndDrop', 'CustomDragAndDrop', 'URLDragAndDrop', + 'FontEnumerator', 'wxTimer', 'wxValidator', 'wxGLCanvas', 'DialogUnits', 'wxImage', 'wxMask', 'PrintFramework', 'wxOGL', 'PythonEvents', 'Threads', 'ActiveXWrapper_Acrobat', 'ActiveXWrapper_IE', - 'wxDragImage', "wxProcess", "FancyText", + 'wxDragImage', "wxProcess", "FancyText", "OOR", "wxWave", + 'wxJoystick', 'DrawXXXList', 'ErrorDialogs', 'wxMimeTypesManager', ]), ('wxPython Library', ['Layoutf', 'wxScrolledMessageDialog', 'wxMultipleChoiceDialog', 'wxPlotCanvas', 'wxFloatBar', - 'PyShell', 'wxCalendar', 'wxMVCTree', 'wxVTKRenderWindow', + 'wxCalendar', 'wxMVCTree', 'wxVTKRenderWindow', 'FileBrowseButton', 'GenericButtons', 'wxEditor', - 'PyShellWindow', + 'ColourSelect', 'ImageBrowser', + 'infoframe', 'ColourDB', 'PyCrust', 'TablePrint', + 'wxRightTextCtrl', ]), - ('Cool Contribs', ['pyTree', 'hangman', 'SlashDot', 'XMLtreeview']), + ('Cool Contribs', ['pyTree', 'hangman', + #'SlashDot', + 'XMLtreeview' + ]), ] #--------------------------------------------------------------------------- +class MyLog(wxPyLog): + def __init__(self, textCtrl, logTime=0): + wxPyLog.__init__(self) + self.tc = textCtrl + self.logTime = logTime + + def DoLogString(self, message, timeStamp): + if self.logTime: + message = time.strftime("%X", time.localtime(timeStamp)) + \ + ": " + message + self.tc.AppendText(message + '\n') + + +#--------------------------------------------------------------------------- + class wxPythonDemo(wxFrame): def __init__(self, parent, id, title): @@ -75,10 +118,17 @@ class wxPythonDemo(wxFrame): self.cwd = os.getcwd() self.curOverview = "" - if wxPlatform == '__WXMSW__': - icon = wxIcon('bitmaps/mondrian.ico', wxBITMAP_TYPE_ICO) - self.SetIcon(icon) + if 1: + icon = wxIconFromXPMData(images.getMondrianData()) + else: + # another way to do it + bmp = images.getMondrianBitmap() + icon = wxEmptyIcon() + icon.CopyFromBitmap(bmp) + self.SetIcon(icon) + + if wxPlatform == '__WXMSW__': # setup a taskbar icon, and catch some events from it self.tbicon = wxTaskBarIcon() self.tbicon.SetIcon(icon, "wxPython Demo") @@ -91,6 +141,8 @@ class wxPythonDemo(wxFrame): self.otherWin = None EVT_IDLE(self, self.OnIdle) EVT_CLOSE(self, self.OnCloseWindow) + EVT_ICONIZE(self, self.OnIconfiy) + EVT_MAXIMIZE(self, self.OnMaximize) self.Centre(wxBOTH) self.CreateStatusBar(1, wxST_SIZEGRIP) @@ -98,8 +150,11 @@ class wxPythonDemo(wxFrame): splitter = wxSplitterWindow(self, -1, style=wxNO_3D|wxSP_3D) splitter2 = wxSplitterWindow(splitter, -1, style=wxNO_3D|wxSP_3D) + def EmptyHandler(evt): pass + EVT_ERASE_BACKGROUND(splitter, EmptyHandler) + EVT_ERASE_BACKGROUND(splitter2, EmptyHandler) - # Prevent TreeCtrl from displaying all items after destruction + # Prevent TreeCtrl from displaying all items after destruction when true self.dying = false # Make a File menu @@ -162,7 +217,7 @@ class wxPythonDemo(wxFrame): EVT_LEFT_DOWN (self.tree, self.OnTreeLeftDown) # Create a Notebook - self.nb = wxNotebook(splitter2, -1) + self.nb = wxNotebook(splitter2, -1, style=wxCLIP_CHILDREN) # Set up a wxHtmlWindow on the Overview Notebook page # we put it in a panel first because there seems to be a @@ -173,7 +228,7 @@ class wxPythonDemo(wxFrame): self.nb.AddPage(self.ovr, "Overview") else: # hopefully I can remove this hacky code soon, see bug #216861 - panel = wxPanel(self.nb, -1) + panel = wxPanel(self.nb, -1, style=wxCLIP_CHILDREN) self.ovr = wxHtmlWindow(panel, -1, size=(400, 400)) self.nb.AddPage(panel, "Overview") @@ -181,6 +236,8 @@ class wxPythonDemo(wxFrame): ovr.SetSize(evt.GetSize()) EVT_SIZE(panel, OnOvrSize) + EVT_ERASE_BACKGROUND(panel, EmptyHandler) + self.SetOverview("Overview", overview) @@ -188,7 +245,6 @@ class wxPythonDemo(wxFrame): # Set up a TextCtrl on the Demo Code Notebook page self.txt = wxTextCtrl(self.nb, -1, style = wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL) - self.txt.SetFont(wxFont(9, wxMODERN, wxNORMAL, wxNORMAL, false)) self.nb.AddPage(self.txt, "Demo Code") @@ -196,7 +252,8 @@ class wxPythonDemo(wxFrame): self.log = wxTextCtrl(splitter2, -1, style = wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL) # Set the wxWindows log target to be this textctrl - wxLog_SetActiveTarget(wxLogTextCtrl(self.log)) + #wxLog_SetActiveTarget(wxLogTextCtrl(self.log)) + wxLog_SetActiveTarget(MyLog(self.log)) @@ -403,6 +460,19 @@ class wxPythonDemo(wxFrame): wxGetApp().ProcessIdle() + #--------------------------------------------- + def OnIconfiy(self, evt): + wxLogMessage("OnIconfiy") + evt.Skip() + + #--------------------------------------------- + def OnMaximize(self, evt): + wxLogMessage("OnMaximize") + evt.Skip() + + + + #--------------------------------------------------------------------------- #--------------------------------------------------------------------------- @@ -443,7 +513,7 @@ class MyApp(wxApp): def main(): try: - demoPath = os.path.split(__file__)[0] + demoPath = os.path.dirname(__file__) os.chdir(demoPath) except: pass