Commit Graph

157 Commits (eef1f52f930d46084b2c8fb99909085eeb64eb5a)

Author SHA1 Message Date
Jonathan G Rennison 674732cd68 Merge: Codechange: Use null pointer literal instead of the NULL macro 6 years ago
Henry Wilson 7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 6 years ago
Jonathan G Rennison ba34ec7ade Merge branch 'master' into jgrpp
Replace build and refit, and group collapse implementations
Fix template creation build and refit

# Conflicts:
#	Makefile.bundle.in
#	config.lib
#	src/animated_tile.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_base.hpp
#	src/blitter/8bpp_base.hpp
#	src/blitter/null.hpp
#	src/build_vehicle_gui.cpp
#	src/command.cpp
#	src/command_func.h
#	src/console_gui.cpp
#	src/core/smallstack_type.hpp
#	src/date.cpp
#	src/debug.cpp
#	src/genworld_gui.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/misc_gui.cpp
#	src/network/core/game.h
#	src/network/core/packet.cpp
#	src/network/core/udp.cpp
#	src/network/core/udp.h
#	src/network/network_content.cpp
#	src/network/network_type.h
#	src/network/network_udp.cpp
#	src/newgrf_house.h
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/osk_gui.cpp
#	src/pathfinder/opf/opf_ship.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.h
#	src/station_base.h
#	src/station_cmd.cpp
#	src/table/gameopt_settings.ini
#	src/table/newgrf_debug_data.h
#	src/table/settings.ini
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehiclelist.cpp
#	src/viewport.cpp
#	src/widgets/dropdown.cpp
#	src/window_gui.h
6 years ago
peter1138 317f69c152 Codechange: Use override specifier in Window-derived classes. 6 years ago
patch-import 536a95dfd0 Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
9 years ago
rubidium beb540ec55 (svn r26538) -Codechange: remove double accounting of the drivers 11 years ago
rubidium b476086c39 (svn r26538) -Codechange: remove double accounting of the drivers 11 years ago
rubidium 034735a54c (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 11 years ago
rubidium 9ed12b0f07 (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 11 years ago
rubidium 2be4215f43 (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 11 years ago
rubidium 0463dbdc9e (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 11 years ago
michi_cc 6645358d86 (svn r26001) -Fix [FS#5795a] (r25686): [OSX] Clear any pending marked characters from an edit box losing focus. 11 years ago
michi_cc 8ceef6ec61 (svn r26001) -Fix [FS#5795a] (r25686): [OSX] Clear any pending marked characters from an edit box losing focus. 11 years ago
michi_cc 164aba8732 (svn r25692) -Add: Replacement of a part of the edit box text with a new string. 11 years ago
michi_cc d15c1c5d4a (svn r25692) -Add: Replacement of a part of the edit box text with a new string. 11 years ago
michi_cc e34fe220e2 (svn r25691) -Add: [OSX] Support for mouse selection in the IME composition string. 11 years ago
michi_cc 30867c487f (svn r25691) -Add: [OSX] Support for mouse selection in the IME composition string. 11 years ago
michi_cc 4dbe823a5f (svn r25690) -Change: [OSX] Position the candidate window at the caret position. 11 years ago
michi_cc e2ec0ddb03 (svn r25690) -Change: [OSX] Position the candidate window at the caret position. 11 years ago
michi_cc 88a71979dd (svn r25689) -Add: [OSX] Display the IME composition string ourself. 11 years ago
michi_cc f5e4131492 (svn r25689) -Add: [OSX] Display the IME composition string ourself. 11 years ago
michi_cc d442d97cf1 (svn r25684) -Change: [Win32] Draw the composition string ourselves if possible. 11 years ago
michi_cc 0883cf76e3 (svn r25684) -Change: [Win32] Draw the composition string ourselves if possible. 11 years ago
michi_cc 931bbd7191 (svn r25683) -Add: Support for a marked/selected range to the textbuf. 11 years ago
michi_cc 64d2fc4d1e (svn r25683) -Add: Support for a marked/selected range to the textbuf. 11 years ago
michi_cc fa7a779cf7 (svn r25681) -Change: [Win32] Position the IME composition window at the caret position. 11 years ago
michi_cc da09fd3077 (svn r25681) -Change: [Win32] Position the IME composition window at the caret position. 11 years ago
michi_cc 1880c36405 (svn r25679) -Codechange: [Win32] Get the result string of an IME input directly without a trip through the window messaging system. 11 years ago
michi_cc 7422120014 (svn r25679) -Codechange: [Win32] Get the result string of an IME input directly without a trip through the window messaging system. 11 years ago
michi_cc 07cd393f7e (svn r25678) -Codechange: Notify the video driver when an edit box lost (global) focus so it can abort any current input composition. 11 years ago
michi_cc 13873d2534 (svn r25678) -Codechange: Notify the video driver when an edit box lost (global) focus so it can abort any current input composition. 11 years ago
michi_cc 872acc5287 (svn r25668) -Codechange: Pass proper Unicode UCS-4 characters instead of just UCS-2 to the window key press handlers. 11 years ago
michi_cc b911f4a452 (svn r25668) -Codechange: Pass proper Unicode UCS-4 characters instead of just UCS-2 to the window key press handlers. 11 years ago
frosch 16feb5c4e9 (svn r25290) -Add: Assign string names to notable windows. 12 years ago
frosch 8157a8afd8 (svn r25290) -Add: Assign string names to notable windows. 12 years ago
frosch 25adefca23 (svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction. 12 years ago
frosch 56e4a8c4d6 (svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction. 12 years ago
frosch 337460249d (svn r25092) -Codechange: Deduplicate keyboard handling between console and editboxes. 12 years ago
frosch c2c50b0c50 (svn r25092) -Codechange: Deduplicate keyboard handling between console and editboxes. 12 years ago
frosch 838388dcd5 (svn r24739) -Codechange: Simplify some code by using Textbuf::Assign. 12 years ago
frosch 6653ac6b36 (svn r24739) -Codechange: Simplify some code by using Textbuf::Assign. 12 years ago
frosch 0ab8e7939b (svn r24738) -Codechange: Remove Textbuf::Initialize in favour of a constructor. 12 years ago
frosch f6d4200f86 (svn r24738) -Codechange: Remove Textbuf::Initialize in favour of a constructor. 12 years ago
frosch 9b196d0fb4 (svn r24324) -Codechange: Turn functions dealing with Textbufs into member functions. 12 years ago
frosch d58eee1e79 (svn r24324) -Codechange: Turn functions dealing with Textbufs into member functions. 12 years ago
frosch 755b52dcc0 (svn r24323) -Codechange: Split Textbuf and associated functions to separate files. 12 years ago
frosch 31eb896143 (svn r24323) -Codechange: Split Textbuf and associated functions to separate files. 12 years ago
truebrain 000ff60e25 (svn r23531) -Codechange: document and rename widgets to be consistent and understandable 13 years ago
truebrain e9f584ac21 (svn r23531) -Codechange: document and rename widgets to be consistent and understandable 13 years ago
truebrain 49e88dcbf0 (svn r23528) -Codechange: move widget enums to widgets/NNN_type.h 13 years ago