Merge branch 'master' into jgrpp
# Conflicts: # .github/workflows/ci-build.yml # .github/workflows/release-linux.yml # .github/workflows/release-macos.yml # .github/workflows/release-windows.yml # .gitignore # COMPILING.md # src/company_gui.cpp # src/date_gui.cpp # src/engine.cpp # src/engine_func.h # src/fileio.cpp # src/linkgraph/linkgraph_gui.h # src/newgrf_debug_gui.cpp # src/newgrf_gui.cpp # src/order_gui.cpp # src/osk_gui.cpp # src/rail_gui.cpp # src/road_gui.cpp # src/script/api/script_event_types.hpp # src/sl/oldloader_sl.cpp # src/smallmap_gui.cpp # src/station_cmd.cpp # src/toolbar_gui.cpp # src/town_gui.cpp # src/transparency_gui.cpp # src/vehicle_gui.cpp # src/widget.cpp # src/widget_type.h # src/widgets/dropdown.cpp # src/widgets/dropdown_func.h # src/widgets/dropdown_type.h # src/widgets/group_widget.h # src/widgets/vehicle_widget.h # src/window.cpp # src/window_gui.h # src/window_type.h
This commit is contained in:
@@ -42,17 +42,17 @@ struct QueryString {
|
||||
}
|
||||
|
||||
public:
|
||||
void DrawEditBox(const Window *w, int wid) const;
|
||||
void ClickEditBox(Window *w, Point pt, int wid, int click_count, bool focus_changed);
|
||||
void HandleEditBox(Window *w, int wid);
|
||||
void DrawEditBox(const Window *w, WidgetID wid) const;
|
||||
void ClickEditBox(Window *w, Point pt, WidgetID wid, int click_count, bool focus_changed);
|
||||
void HandleEditBox(Window *w, WidgetID wid);
|
||||
|
||||
Point GetCaretPosition(const Window *w, int wid) const;
|
||||
Rect GetBoundingRect(const Window *w, int wid, const char *from, const char *to) const;
|
||||
ptrdiff_t GetCharAtPosition(const Window *w, int wid, const Point &pt) const;
|
||||
Point GetCaretPosition(const Window *w, WidgetID wid) const;
|
||||
Rect GetBoundingRect(const Window *w, WidgetID wid, const char *from, const char *to) const;
|
||||
ptrdiff_t GetCharAtPosition(const Window *w, WidgetID wid, const Point &pt) const;
|
||||
};
|
||||
|
||||
void ShowOnScreenKeyboard(Window *parent, int button);
|
||||
void UpdateOSKOriginalText(const Window *parent, int button);
|
||||
bool IsOSKOpenedFor(const Window *w, int button);
|
||||
void ShowOnScreenKeyboard(Window *parent, WidgetID button);
|
||||
void UpdateOSKOriginalText(const Window *parent, WidgetID button);
|
||||
bool IsOSKOpenedFor(const Window *w, WidgetID button);
|
||||
|
||||
#endif /* QUERYSTRING_GUI_H */
|
||||
|
Reference in New Issue
Block a user