bool init(int *argc, char **argv[], char const *parameter_string, char const **error)
{
gtk_disable_setlocale();
- static GOptionEntry entries[] = {{NULL}};
+ static GOptionEntry entries[] = {{}};
char const *translation_domain = NULL;
GError *gerror = NULL;
bool ret = gtk_init_with_args(argc, argv, parameter_string, entries, translation_domain, &gerror) != 0;
}
}
- Widget root;
-
#define IMPL(T, F) template<> _IMPL(T, F)
-#define _IMPL(T, F) struct verify<T *> { using self = T; static self test(self it) { return self(F(it)); } }
+#define _IMPL(T, F) struct verify<T *> { using self = T; static self test(self it) { return self::from(F(it)); } }
template<class T>
struct verify;
template<class T> _IMPL(T,);
-#define this (verify<self>::test(*static_cast<self>(this)))
+ template<class T>
+ using pointer_remove_const = std::add_pointer<
+ typename std::remove_const<
+ typename std::remove_pointer<T>::type
+ >::type
+ >;
+
+WARNING_SUPPRESS_CLANG(keyword-macro)
+#define this (verify<self>::test(*static_cast<self>(const_cast<pointer_remove_const<decltype(this)>::type>(this))))
+WARNING_RESTORE_CLANG(keyword-macro)
IMPL(Editable, GTK_EDITABLE);
void IEditable::editable(bool value)
{
- gtk_editable_set_editable(GTK_EDITABLE(this), value);
+ gtk_editable_set_editable(this, value);
}
+ IMPL(TreeModel, GTK_TREE_MODEL);
+
IMPL(Widget, GTK_WIDGET);
- Widget::Widget() : Widget(nullptr)
+ Widget::Widget(ui::New_t) : Widget(nullptr)
{}
- alert_response IWidget::alert(std::string text, std::string title, alert_type type, alert_icon icon)
+ Window IWidget::window()
{
- auto ret = gtk_MessageBox(this, text.c_str(),
- title.c_str(),
- type == alert_type::OK ? eMB_OK :
- type == alert_type::OKCANCEL ? eMB_OKCANCEL :
- type == alert_type::YESNO ? eMB_YESNO :
- type == alert_type::YESNOCANCEL ? eMB_YESNOCANCEL :
- type == alert_type::NOYES ? eMB_NOYES :
- eMB_OK,
- icon == alert_icon::Default ? eMB_ICONDEFAULT :
- icon == alert_icon::Error ? eMB_ICONERROR :
- icon == alert_icon::Warning ? eMB_ICONWARNING :
- icon == alert_icon::Question ? eMB_ICONQUESTION :
- icon == alert_icon::Asterisk ? eMB_ICONASTERISK :
- eMB_ICONDEFAULT
- );
- return
- ret == eIDOK ? alert_response::OK :
- ret == eIDCANCEL ? alert_response::CANCEL :
- ret == eIDYES ? alert_response::YES :
- ret == eIDNO ? alert_response::NO :
- alert_response::OK;
+ return Window::from(gtk_widget_get_toplevel(this));
}
const char *
IWidget::file_dialog(bool open, const char *title, const char *path, const char *pattern, bool want_load,
bool want_import, bool want_save)
{
- return ::file_dialog(this, open, title, path, pattern, want_load, want_import, want_save);
+ return ::file_dialog(this.window(), open, title, path, pattern, want_load, want_import, want_save);
}
bool IWidget::visible()
return gtk_widget_get_visible(this) != 0;
}
+ void IWidget::visible(bool shown)
+ {
+ if (shown) {
+ this.show();
+ } else {
+ this.hide();
+ }
+ }
+
void IWidget::show()
{
gtk_widget_show(this);
}
+ void IWidget::hide()
+ {
+ gtk_widget_hide(this);
+ }
+
Dimensions IWidget::dimensions()
{
GtkAllocation allocation;
gtk_widget_set_size_request(this, width, height);
}
+ void IWidget::destroy()
+ {
+ gtk_widget_destroy(this);
+ }
+
IMPL(Container, GTK_CONTAINER);
void IContainer::add(Widget widget)
delete data;
};
auto func = [](_GtkWidget *widget, GdkEventKey *event, user_data *args) -> bool {
- return args->f(Widget(widget), event, args->extra);
+ return args->f(Widget::from(widget), event, args->extra);
};
auto clos = g_cclosure_new(G_CALLBACK(+func), pass, reinterpret_cast<GClosureNotify>(+dtor));
return g_signal_connect_closure(G_OBJECT(this), "key-press-event", clos, false);
gtk_window_add_accel_group(this, group);
}
+ WARNING_SUPPRESS(deprecated-declarations)
IMPL(Alignment, GTK_ALIGNMENT);
Alignment::Alignment(float xalign, float yalign, float xscale, float yscale)
: Alignment(GTK_ALIGNMENT(gtk_alignment_new(xalign, yalign, xscale, yscale)))
{}
+ WARNING_RESTORE(deprecated-declarations)
IMPL(Frame, GTK_FRAME);
IMPL(Button, GTK_BUTTON);
- Button::Button() : Button(GTK_BUTTON(gtk_button_new()))
+ Button::Button(ui::New_t) : Button(GTK_BUTTON(gtk_button_new()))
{}
Button::Button(const char *label) : Button(GTK_BUTTON(gtk_button_new_with_label(label)))
IMPL(ToggleButton, GTK_TOGGLE_BUTTON);
- bool IToggleButton::active()
+ bool IToggleButton::active() const
+ {
+ return gtk_toggle_button_get_active(this) != 0;
+ }
+
+ void IToggleButton::active(bool value)
{
- return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(this)) != 0;
+ gtk_toggle_button_set_active(this, value);
}
IMPL(CheckButton, GTK_CHECK_BUTTON);
- CheckButton::CheckButton() : CheckButton(GTK_CHECK_BUTTON(gtk_check_button_new()))
+ CheckButton::CheckButton(ui::New_t) : CheckButton(GTK_CHECK_BUTTON(gtk_check_button_new()))
{}
CheckButton::CheckButton(const char *label) : CheckButton(GTK_CHECK_BUTTON(gtk_check_button_new_with_label(label)))
IMPL(MenuItem, GTK_MENU_ITEM);
- MenuItem::MenuItem() : MenuItem(GTK_MENU_ITEM(gtk_menu_item_new()))
+ MenuItem::MenuItem(ui::New_t) : MenuItem(GTK_MENU_ITEM(gtk_menu_item_new()))
{}
MenuItem::MenuItem(const char *label, bool mnemonic) : MenuItem(
GTK_MENU_ITEM((mnemonic ? gtk_menu_item_new_with_mnemonic : gtk_menu_item_new_with_label)(label)))
{}
+ WARNING_SUPPRESS(deprecated-declarations)
IMPL(TearoffMenuItem, GTK_TEAROFF_MENU_ITEM);
- TearoffMenuItem::TearoffMenuItem() : TearoffMenuItem(GTK_TEAROFF_MENU_ITEM(gtk_tearoff_menu_item_new()))
+ TearoffMenuItem::TearoffMenuItem(ui::New_t) : TearoffMenuItem(GTK_TEAROFF_MENU_ITEM(gtk_tearoff_menu_item_new()))
{}
+ WARNING_RESTORE(deprecated-declarations)
IMPL(ComboBoxText, GTK_COMBO_BOX_TEXT);
- ComboBoxText::ComboBoxText() : ComboBoxText(GTK_COMBO_BOX_TEXT(gtk_combo_box_text_new()))
+ ComboBoxText::ComboBoxText(ui::New_t) : ComboBoxText(GTK_COMBO_BOX_TEXT(gtk_combo_box_text_new()))
{}
IMPL(ScrolledWindow, GTK_SCROLLED_WINDOW);
- ScrolledWindow::ScrolledWindow() : ScrolledWindow(GTK_SCROLLED_WINDOW(gtk_scrolled_window_new(nullptr, nullptr)))
+ ScrolledWindow::ScrolledWindow(ui::New_t) : ScrolledWindow(GTK_SCROLLED_WINDOW(gtk_scrolled_window_new(nullptr, nullptr)))
{}
void IScrolledWindow::overflow(Policy x, Policy y)
gtk_scrolled_window_set_policy(this, static_cast<GtkPolicyType>(x), static_cast<GtkPolicyType>(y));
}
+ IMPL(Box, GTK_BOX);
+
+ void IBox::pack_start(ui::Widget child, bool expand, bool fill, unsigned int padding)
+ {
+ gtk_box_pack_start(this, child, expand, fill, padding);
+ }
+
+ void IBox::pack_end(ui::Widget child, bool expand, bool fill, unsigned int padding)
+ {
+ gtk_box_pack_end(this, child, expand, fill, padding);
+ }
+
+ WARNING_SUPPRESS(deprecated-declarations)
IMPL(VBox, GTK_VBOX);
VBox::VBox(bool homogenous, int spacing) : VBox(GTK_VBOX(gtk_vbox_new(homogenous, spacing)))
IMPL(HPaned, GTK_HPANED);
- HPaned::HPaned() : HPaned(GTK_HPANED(gtk_hpaned_new()))
+ HPaned::HPaned(ui::New_t) : HPaned(GTK_HPANED(gtk_hpaned_new()))
{}
IMPL(VPaned, GTK_VPANED);
- VPaned::VPaned() : VPaned(GTK_VPANED(gtk_vpaned_new()))
+ VPaned::VPaned(ui::New_t) : VPaned(GTK_VPANED(gtk_vpaned_new()))
{}
+ WARNING_RESTORE(deprecated-declarations)
IMPL(Menu, GTK_MENU);
- Menu::Menu() : Menu(GTK_MENU(gtk_menu_new()))
+ Menu::Menu(ui::New_t) : Menu(GTK_MENU(gtk_menu_new()))
{}
+ WARNING_SUPPRESS(deprecated-declarations)
IMPL(Table, GTK_TABLE);
Table::Table(std::size_t rows, std::size_t columns, bool homogenous) : Table(
)
{}
+ void ITable::attach(Widget child, TableAttach attach, TableAttachOptions options, TablePadding padding) {
+ gtk_table_attach(this, child,
+ attach.left, attach.right, attach.top, attach.bottom,
+ static_cast<GtkAttachOptions>(options.x), static_cast<GtkAttachOptions>(options.y),
+ padding.x, padding.y
+ );
+ }
+ WARNING_RESTORE(deprecated-declarations)
+
IMPL(TextView, GTK_TEXT_VIEW);
- TextView::TextView() : TextView(GTK_TEXT_VIEW(gtk_text_view_new()))
+ TextView::TextView(ui::New_t) : TextView(GTK_TEXT_VIEW(gtk_text_view_new()))
{}
void ITextView::text(char const *str)
gtk_text_buffer_set_text(buffer, str, -1);
}
- TreeView::TreeView() : TreeView(GTK_TREE_VIEW(gtk_tree_view_new()))
+ TreeView::TreeView(ui::New_t) : TreeView(GTK_TREE_VIEW(gtk_tree_view_new()))
{}
TreeView::TreeView(TreeModel model) : TreeView(GTK_TREE_VIEW(gtk_tree_view_new_with_model(model)))
IMPL(Image, GTK_IMAGE);
- Image::Image() : Image(GTK_IMAGE(gtk_image_new()))
+ Image::Image(ui::New_t) : Image(GTK_IMAGE(gtk_image_new()))
{}
IMPL(Entry, GTK_ENTRY);
- Entry::Entry() : Entry(GTK_ENTRY(gtk_entry_new()))
+ Entry::Entry(ui::New_t) : Entry(GTK_ENTRY(gtk_entry_new()))
{}
- Entry::Entry(std::size_t max_length) : Entry()
+ Entry::Entry(std::size_t max_length) : Entry(ui::New)
{
gtk_entry_set_max_length(this, static_cast<gint>(max_length));
}
GTK_SPIN_BUTTON(gtk_spin_button_new(adjustment, climb_rate, digits)))
{}
+ WARNING_SUPPRESS(deprecated-declarations)
IMPL(HScale, GTK_HSCALE);
HScale::HScale(Adjustment adjustment) : HScale(GTK_HSCALE(gtk_hscale_new(adjustment)))
HScale::HScale(double min, double max, double step) : HScale(GTK_HSCALE(gtk_hscale_new_with_range(min, max, step)))
{}
+ WARNING_RESTORE(deprecated-declarations)
IMPL(Adjustment, GTK_ADJUSTMENT);
IMPL(CellRendererText, GTK_CELL_RENDERER_TEXT);
- CellRendererText::CellRendererText() : CellRendererText(GTK_CELL_RENDERER_TEXT(gtk_cell_renderer_text_new()))
+ CellRendererText::CellRendererText(ui::New_t) : CellRendererText(GTK_CELL_RENDERER_TEXT(gtk_cell_renderer_text_new()))
{}
IMPL(TreeViewColumn, GTK_TREE_VIEW_COLUMN);
IMPL(AccelGroup, GTK_ACCEL_GROUP);
- AccelGroup::AccelGroup() : AccelGroup(GTK_ACCEL_GROUP(gtk_accel_group_new()))
+ AccelGroup::AccelGroup(ui::New_t) : AccelGroup(GTK_ACCEL_GROUP(gtk_accel_group_new()))
{}
IMPL(ListStore, GTK_LIST_STORE);
gtk_list_store_clear(this);
}
+ void IListStore::append()
+ {
+ gtk_list_store_append(this, nullptr);
+ }
+
+ IMPL(TreeStore, GTK_TREE_STORE);
+
// IMPL(TreePath, GTK_TREE_PATH);
- TreePath::TreePath() : TreePath(gtk_tree_path_new())
+ TreePath::TreePath(ui::New_t) : TreePath(gtk_tree_path_new())
{}
TreePath::TreePath(const char *path) : TreePath(gtk_tree_path_new_from_string(path))
// Custom
+#if GTK_TARGET == 3
+
+ IMPL(GLArea, (void *));
+
+#elif GTK_TARGET == 2
+
+ IMPL(GLArea, GTK_DRAWING_AREA);
+
+#endif
+
guint IGLArea::on_render(GCallback pFunction, void *data)
{
#if GTK_TARGET == 3
#endif
}
+ // global
+
+ Window root{ui::null};
+
+ alert_response alert(Window parent, std::string text, std::string title, alert_type type, alert_icon icon)
+ {
+ auto ret = gtk_MessageBox(parent, text.c_str(),
+ title.c_str(),
+ type == alert_type::OK ? eMB_OK :
+ type == alert_type::OKCANCEL ? eMB_OKCANCEL :
+ type == alert_type::YESNO ? eMB_YESNO :
+ type == alert_type::YESNOCANCEL ? eMB_YESNOCANCEL :
+ type == alert_type::NOYES ? eMB_NOYES :
+ eMB_OK,
+ icon == alert_icon::Default ? eMB_ICONDEFAULT :
+ icon == alert_icon::Error ? eMB_ICONERROR :
+ icon == alert_icon::Warning ? eMB_ICONWARNING :
+ icon == alert_icon::Question ? eMB_ICONQUESTION :
+ icon == alert_icon::Asterisk ? eMB_ICONASTERISK :
+ eMB_ICONDEFAULT
+ );
+ return
+ ret == eIDOK ? alert_response::OK :
+ ret == eIDCANCEL ? alert_response::CANCEL :
+ ret == eIDYES ? alert_response::YES :
+ ret == eIDNO ? alert_response::NO :
+ alert_response::OK;
+ }
+
}
projects / xonotic / netradiant.git / blobdiff