Fix for README.txt in help menu

Mac platform-specdific checks


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

wxPython/wxPython/tools/XRCed/globals.py

@@ -16,7 +16,7 @@ else:
     modernFont = wxFont(10, wxMODERN, wxNORMAL, wxNORMAL)
 
 progname = 'XRCed'
-version = '0.0.9-4'
+version = '0.0.9-5'
 
 # Global variables
 

wxPython/wxPython/tools/XRCed/panel.py

@@ -11,7 +11,10 @@ from wxPython.html import wxHtmlWindow
 # Properties panel containing notebook
 class Panel(wxNotebook):
     def __init__(self, parent, id = -1):
-        wxNotebook.__init__(self, parent, id, style=wxNB_BOTTOM)
+        if wxPlatform != '__WXMAC__':   # some problems with this style on macs
+            wxNotebook.__init__(self, parent, id, style=wxNB_BOTTOM)
+        else:
+            wxNotebook.__init__(self, parent, id)
         global panel
         g.panel = panel = self
         self.modified = false

wxPython/wxPython/tools/XRCed/xrced.py

@@ -648,14 +648,18 @@ class Frame(wxFrame):
         self.tb.ToggleTool(self.ID_AUTO_REFRESH, conf.autoRefresh)
 
     def OnAbout(self, evt):
-        str = '%s %s\n\nRoman Rolinsky <rolinsky@mema.ucl.ac.be>' % \
-              (progname, version)
-        dlg = wxMessageDialog(self, str, 'About ' + progname, wxOK | wxCENTRE)
+        str = '''\
+XRCed version %s
+
+(c) Roman Rolinsky <rollrom@users.sourceforge.net>
+Homepage: http://xrced.sourceforge.net\
+''' % version
+        dlg = wxMessageDialog(self, str, 'About XRCed', wxOK | wxCENTRE)
         dlg.ShowModal()
         dlg.Destroy()
 
     def OnReadme(self, evt):
-        text = open(os.path.join(basePath, 'README'), 'r').read()
+        text = open(os.path.join(basePath, 'README.txt'), 'r').read()
         dlg = ScrolledMessageDialog(self, text, "XRCed README")
         dlg.ShowModal()
         dlg.Destroy()
@@ -920,9 +924,10 @@ class App(wxApp):
         try:
             opts, args = getopt.getopt(sys.argv[1:], 'dvh')
         except getopt.GetoptError:
-            print >> sys.stderr, 'Unknown option'
-            usage()
-            sys.exit(1)
+            if wxPlatform != '__WXMAC__': # macs have some extra parameters
+                print >> sys.stderr, 'Unknown option'
+                usage()
+                sys.exit(1)
         for o,a in opts:
             if o == '-h':
                 usage()