Merge branch 'master' of github.com:manuelcortez/TWBlue

This commit is contained in:
Manuel Cortez 2014-11-29 11:09:39 -06:00
commit af32b3ceb6
3 changed files with 5 additions and 1 deletions

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "windows-dependencies"]
path = windows-dependencies
url = https://github.com/jmdaweb/TWBlue_deps_windows.git

View File

@ -55,7 +55,7 @@ class SysTrayIcon(wx.TaskBarIcon):
if (self.frame.showing): if (self.frame.showing):
self.frame.SetFocus() self.frame.SetFocus()
else: else:
self.frame.onShow_hide() self.frame.show_hide()
def Destroy(self): def Destroy(self):
self.menu.Destroy() self.menu.Destroy()

1
windows-dependencies Submodule

@ -0,0 +1 @@
Subproject commit e34b965499b5b99239fd2e4a661cdcbf207c4cd4