switch ( button.get() )
{
+ case ButtonEnumeration::INVALID: break;
case ButtonEnumeration::LEFT: buttons |= RAD_LBUTTON; break;
case ButtonEnumeration::MIDDLE: buttons |= RAD_MBUTTON; break;
case ButtonEnumeration::RIGHT: buttons |= RAD_RBUTTON; break;
bool g_bCrossHairs = false;
-ui::Menu XYWnd::m_mnuDrop{nullptr};
+ui::Menu XYWnd::m_mnuDrop(ui::null);
// this is disabled, and broken
// http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=394
unsigned char* img;
const char* filename;
- filename = ui::file_dialog( GTK_WIDGET( MainFrame_getWindow() ), FALSE, "Save Image", 0, FILTER_BMP );
+ filename = ui::file_dialog( MainFrame_getWindow( ), FALSE, "Save Image", 0, FILTER_BMP );
if ( !filename ) {
return;
}
Shader* XYWnd::m_state_selected = 0;
void xy_update_xor_rectangle( XYWnd& self, rect_t area ){
- if ( gtk_widget_get_visible( self.GetWidget() ) ) {
+ if ( self.GetWidget().visible() ) {
self.m_XORRectangle.set( rectangle_from_area( area.min, area.max, self.Width(), self.Height() ) );
}
}
m_entityCreate = false;
- m_mnuDrop = ui::Menu{nullptr};
+ m_mnuDrop = ui::Menu(ui::null);
GlobalWindowObservers_add( m_window_observer );
GlobalWindowObservers_connectWidget( m_gl_widget );
m_window_observer->setRectangleDrawCallback( ReferenceCaller1<XYWnd, rect_t, xy_update_xor_rectangle>( *this ) );
m_window_observer->setView( m_view );
- g_object_ref( m_gl_widget );
+ g_object_ref( m_gl_widget._handle );
gtk_widget_set_events( m_gl_widget, GDK_DESTROY | GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_SCROLL_MASK );
gtk_widget_set_can_focus( m_gl_widget, true );
onDestroyed();
if ( m_mnuDrop ) {
- gtk_widget_destroy( GTK_WIDGET( m_mnuDrop ) );
- m_mnuDrop = ui::Menu{nullptr};
+ m_mnuDrop.destroy();
+ m_mnuDrop = ui::Menu(ui::null);
}
g_signal_handler_disconnect( G_OBJECT( m_gl_widget ), m_sizeHandler );
item.show();
m_stack.back().first.add(item);
- auto submenu = ui::Menu();
- gtk_menu_item_set_submenu( item, GTK_WIDGET( submenu ) );
+ auto submenu = ui::Menu(ui::New);
+ gtk_menu_item_set_submenu( item, submenu );
m_stack.push_back( MenuPair( submenu, name ) );
}
}
if ( !m_mnuDrop ) { // first time, load it up
- auto menu = m_mnuDrop = ui::Menu();
+ auto menu = m_mnuDrop = ui::Menu(ui::New);
EntityClassMenuInserter inserter( menu );
GlobalEntityClassManager().forEach( inserter );
void WXY_BackgroundSelect( void ){
bool brushesSelected = Scene_countSelectedBrushes( GlobalSceneGraph() ) != 0;
if ( !brushesSelected ) {
- ui::root.alert( "You have to select some brushes to get the bounding box for.\n",
+ ui::root.window().alert( "You have to select some brushes to get the bounding box for.\n",
"No selection", ui::alert_type::OK, ui::alert_icon::Error );
return;
}
m_state_stack.back().m_state = state;
}
}
-const EStyle getStyle() const {
+EStyle getStyle() const {
return eWireframeOnly;
}
void PushState(){
void unrealise(){
if ( ++m_unrealised == 1 ) {
if ( XYWnd::m_mnuDrop ) {
- gtk_widget_destroy( GTK_WIDGET( XYWnd::m_mnuDrop ) );
- XYWnd::m_mnuDrop = ui::Menu(nullptr);
+ XYWnd::m_mnuDrop.destroy();
+ XYWnd::m_mnuDrop = ui::Menu(ui::null);
}
}
}