another merge from WX_2_6_BRANCH
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -544,6 +544,7 @@ class Frame(wx.Frame):
 | 
			
		||||
                event.Check(win.lineNumbers)
 | 
			
		||||
            elif id == ID_AUTO_SAVESETTINGS:
 | 
			
		||||
                event.Check(self.autoSaveSettings)
 | 
			
		||||
                event.Enable(self.config is not None)
 | 
			
		||||
            elif id == ID_SAVESETTINGS:
 | 
			
		||||
                event.Enable(self.config is not None and
 | 
			
		||||
                             hasattr(self, 'DoSaveSettings'))
 | 
			
		||||
@@ -552,12 +553,15 @@ class Frame(wx.Frame):
 | 
			
		||||
                
 | 
			
		||||
            elif id == ID_EXECSTARTUPSCRIPT:
 | 
			
		||||
                event.Check(self.execStartupScript)
 | 
			
		||||
                event.Enable(self.config is not None)
 | 
			
		||||
 | 
			
		||||
            elif id == ID_SAVEHISTORY:
 | 
			
		||||
                event.Check(self.saveHistory and self.dataDir is not None)
 | 
			
		||||
                event.Check(self.saveHistory)
 | 
			
		||||
                event.Enable(self.dataDir is not None)
 | 
			
		||||
            elif id == ID_EDITSTARTUPSCRIPT:
 | 
			
		||||
                event.Enable(hasattr(self, 'EditStartupScript'))
 | 
			
		||||
 | 
			
		||||
                event.Enable(self.dataDir is not None)
 | 
			
		||||
                
 | 
			
		||||
            elif id == ID_FIND:
 | 
			
		||||
                event.Enable(hasattr(win, 'DoFindNext'))
 | 
			
		||||
            elif id == ID_FINDNEXT:
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user