thyphoon/PBMap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Linux SetActiveGadget(-1) fix"

Browse Source 
This reverts commit 86483640d7.

# Conflicts:
#	PBMap.pb
This commit is contained in:
djes
2016-10-03 22:39:14 +02:00
parent b900bdc9db
commit 8ac8a08059
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
PBMap.pb
View File

@@ -2229,8 +2229,6 @@ CompilerIf #PB_Compiler_IsMainFile
CompilerElse CompilerElse
Define Dummy = -1 Define Dummy = -1
CompilerEndIf CompilerEndIf
;***
Define Event.i, Gadget.i, Quit.b = #False Define Event.i, Gadget.i, Quit.b = #False
Define pfValue.d Define pfValue.d
Define OpenSeaMap = 0, Degrees = 1 Define OpenSeaMap = 0, Degrees = 1
@@ -2334,10 +2332,21 @@ CompilerIf #PB_Compiler_IsMainFile
CompilerEndIf CompilerEndIf
<<<<<<< HEAD
; IDE Options = PureBasic 5.42 LTS (Windows - x64) ; IDE Options = PureBasic 5.42 LTS (Windows - x64)
; CursorPosition = 961 ; CursorPosition = 961
; FirstLine = 939 ; FirstLine = 939
=======
; IDE Options = PureBasic 5.50 (Windows - x64)
; CursorPosition = 1156
; FirstLine = 1144
>>>>>>> parent of 8648364... Linux SetActiveGadget(-1) fix
; Folding = ----------------
; EnableThread
; EnableXP
; IDE Options = PureBasic 5.42 LTS (Windows - x64)
; CursorPosition = 2308
; FirstLine = 2291
; Folding = ---------------- ; Folding = ----------------
; EnableUnicode ; EnableUnicode
; EnableThread
; EnableXP ; EnableXP