Skip to content

Commit

Permalink
remove implicit OSName definitions
Browse files Browse the repository at this point in the history
  • Loading branch information
tronburgundy committed Feb 19, 2016
1 parent b845aa3 commit 13272e1
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions Version 0.2/mainWindow.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,6 @@
dataLoggerPath = str(configPref['Data path'])

date = datetime.datetime.now()
###############################################################################################################
######## Get OS running the application #######################################################################
MacOsName = 'Darwin'
WinOsName = 'Windows'
LinuxOsName = 'Linux'
GetOsName = str(platform.system())

##############################################################################################################
class EditPreferencesSngChanWindow(wx.Dialog):
Expand Down Expand Up @@ -438,7 +432,7 @@ def __init__(self,parent, ID):
wx.Frame.__init__(self,parent,ID,"Acoustic Ruler Control Application",size=(930,500),style=wx.MINIMIZE_BOX|wx.SYSTEM_MENU|wx.CAPTION|wx.CLOSE_BOX)

#fixes mismatch between C/C++ and Windows locale
while WinOsName == GetOsName or MacOsName == GetOsName:
while str(platform.system()) == 'Windows' or str(platform.system()) == 'Darwin':
try:
self.locale = wx.Locale(wx.LANGUAGE_ENGLISH)
break
Expand Down Expand Up @@ -480,7 +474,7 @@ def mainMenu(self):
#teamBtn.Bind(wx.EVT_BUTTON, self.openTeamChan)

#Button effect on the Mac & Windows
while WinOsName == GetOsName or MacOsName == GetOsName:
while str(platform.system()) == 'Windows' or str(platform.system()) == 'Darwin':
try:
wx.EVT_ENTER_WINDOW(singleChanBtn, self.OnEnter)
wx.EVT_LEAVE_WINDOW(singleChanBtn, self.OnLeave)
Expand Down

0 comments on commit 13272e1

Please sign in to comment.