Revert "Linux SetActiveGadget(-1) fix"
This reverts commit 86483640d7
.
# Conflicts:
# PBMap.pb
This commit is contained in:
15
PBMap.pb
15
PBMap.pb
@@ -2229,8 +2229,6 @@ CompilerIf #PB_Compiler_IsMainFile
|
||||
CompilerElse
|
||||
Define Dummy = -1
|
||||
CompilerEndIf
|
||||
;***
|
||||
|
||||
Define Event.i, Gadget.i, Quit.b = #False
|
||||
Define pfValue.d
|
||||
Define OpenSeaMap = 0, Degrees = 1
|
||||
@@ -2334,10 +2332,21 @@ CompilerIf #PB_Compiler_IsMainFile
|
||||
|
||||
CompilerEndIf
|
||||
|
||||
<<<<<<< HEAD
|
||||
; IDE Options = PureBasic 5.42 LTS (Windows - x64)
|
||||
; CursorPosition = 961
|
||||
; FirstLine = 939
|
||||
=======
|
||||
; IDE Options = PureBasic 5.50 (Windows - x64)
|
||||
; CursorPosition = 1156
|
||||
; FirstLine = 1144
|
||||
>>>>>>> parent of 8648364... Linux SetActiveGadget(-1) fix
|
||||
; Folding = ----------------
|
||||
; EnableUnicode
|
||||
; EnableThread
|
||||
; EnableXP
|
||||
; IDE Options = PureBasic 5.42 LTS (Windows - x64)
|
||||
; CursorPosition = 2308
|
||||
; FirstLine = 2291
|
||||
; Folding = ----------------
|
||||
; EnableUnicode
|
||||
; EnableXP
|
Reference in New Issue
Block a user