X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fdd3ed7a8f5e43d44fffef5c7f857f6256dcc67a..e7b3d6babbc006f2936be6827d0b826adbbc82e4:/src/gtk/minifram.cpp diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp index 8e4bbef3eb..ee93f8546c 100644 --- a/src/gtk/minifram.cpp +++ b/src/gtk/minifram.cpp @@ -12,6 +12,9 @@ #endif #include "wx/minifram.h" + +#if wxUSE_MINIFRAME + #include "wx/dcscreen.h" #include "gtk/gtk.h" @@ -65,39 +68,39 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g { if (g_isIdle) wxapp_install_idle_handler(); - if (!win->HasVMT()) return; + if (!win->m_hasVMT) return; if (gdk_event->count > 0) return; gtk_draw_shadow( widget->style, widget->window, - GTK_STATE_NORMAL, - GTK_SHADOW_OUT, - 0, 0, - win->m_width, win->m_height ); + GTK_STATE_NORMAL, + GTK_SHADOW_OUT, + 0, 0, + win->m_width, win->m_height ); if (!win->m_title.IsEmpty() && - ((win->m_windowStyle & wxCAPTION) || - (win->m_windowStyle & wxTINY_CAPTION_HORIZ) || - (win->m_windowStyle & wxTINY_CAPTION_VERT))) + ((win->GetWindowStyle() & wxCAPTION) || + (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) || + (win->GetWindowStyle() & wxTINY_CAPTION_VERT))) { GdkGC *gc = gdk_gc_new( widget->window ); - GdkFont *font = wxSMALL_FONT->GetInternalFont(1.0); - int x = 2; - if (win->m_windowStyle & wxSYSTEM_MENU) x = 18; - + GdkFont *font = wxSMALL_FONT->GetInternalFont(1.0); + int x = 2; + if (win->GetWindowStyle() & wxSYSTEM_MENU) x = 18; + gdk_gc_set_foreground( gc, &widget->style->bg[GTK_STATE_SELECTED] ); - gdk_draw_rectangle( widget->window, gc, TRUE, - x, - 3, - win->m_width - 4 - x, - font->ascent + font->descent+1 ); - + gdk_draw_rectangle( widget->window, gc, TRUE, + x, + 3, + win->m_width - 4 - x, + font->ascent + font->descent+1 ); + gdk_gc_set_foreground( gc, &widget->style->white ); gdk_draw_string( widget->window, font, gc, - x+2, - 3+font->ascent, - win->m_title.mb_str() ); - + x+2, + 3+font->ascent, + win->m_title.mb_str() ); + gdk_gc_unref( gc ); } } @@ -110,38 +113,38 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU { if (g_isIdle) wxapp_install_idle_handler(); - if (!win->HasVMT()) return; + if (!win->m_hasVMT) return; gtk_draw_shadow( widget->style, widget->window, - GTK_STATE_NORMAL, - GTK_SHADOW_OUT, - 0, 0, - win->m_width, win->m_height ); - + GTK_STATE_NORMAL, + GTK_SHADOW_OUT, + 0, 0, + win->m_width, win->m_height ); + if (!win->m_title.IsEmpty() && - ((win->m_windowStyle & wxCAPTION) || - (win->m_windowStyle & wxTINY_CAPTION_HORIZ) || - (win->m_windowStyle & wxTINY_CAPTION_VERT))) + ((win->GetWindowStyle() & wxCAPTION) || + (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) || + (win->GetWindowStyle() & wxTINY_CAPTION_VERT))) { GdkGC *gc = gdk_gc_new( widget->window ); - GdkFont *font = wxSMALL_FONT->GetInternalFont(1.0); - int x = 2; - if (win->m_windowStyle & wxSYSTEM_MENU) x = 17; - + GdkFont *font = wxSMALL_FONT->GetInternalFont(1.0); + int x = 2; + if (win->GetWindowStyle() & wxSYSTEM_MENU) x = 17; + gdk_gc_set_foreground( gc, &widget->style->bg[GTK_STATE_SELECTED] ); - gdk_draw_rectangle( widget->window, gc, TRUE, - x, - 3, - win->m_width - 4 - x, - font->ascent + font->descent+1 ); - + gdk_draw_rectangle( widget->window, gc, TRUE, + x, + 3, + win->m_width - 4 - x, + font->ascent + font->descent+1 ); + gdk_gc_set_foreground( gc, &widget->style->white ); gdk_draw_string( widget->window, font, gc, - x+2, - 3+font->ascent, - win->m_title.mb_str() ); - + x+2, + 3+font->ascent, + win->m_title.mb_str() ); + gdk_gc_unref( gc ); } } @@ -154,7 +157,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton { if (g_isIdle) wxapp_install_idle_handler(); - if (!win->HasVMT()) return FALSE; + if (!win->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return TRUE; if (g_blockEventsOnScroll) return TRUE; @@ -164,14 +167,14 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton (GdkEventMask) (GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | - GDK_POINTER_MOTION_MASK | + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | - GDK_BUTTON_MOTION_MASK | + GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK), (GdkWindow *) NULL, (GdkCursor *) NULL, GDK_CURRENT_TIME ); - + win->m_diffX = (int)gdk_event->x; win->m_diffY = (int)gdk_event->y; DrawFrame( widget, 0, 0, win->m_width, win->m_height ); @@ -191,7 +194,7 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto { if (g_isIdle) wxapp_install_idle_handler(); - if (!win->HasVMT()) return FALSE; + if (!win->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return TRUE; if (g_blockEventsOnScroll) return TRUE; @@ -224,7 +227,7 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion { if (g_isIdle) wxapp_install_idle_handler(); - if (!win->HasVMT()) return FALSE; + if (!win->m_hasVMT) return FALSE; if (g_blockEventsOnDrag) return TRUE; if (g_blockEventsOnScroll) return TRUE; @@ -274,7 +277,7 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title if ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT)) m_miniTitle = 13; - + m_miniEdge = 3; m_isDragging = FALSE; m_oldX = -1; @@ -290,8 +293,8 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title GtkWidget *close_button = gtk_button_new_with_label( "x" ); gtk_myfixed_put( GTK_MYFIXED(m_mainWidget), - close_button, - 4, 4, 12, 11 ); + close_button, + 4, 4, 12, 11 ); gtk_widget_show( close_button ); @@ -318,3 +321,5 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title return TRUE; } + +#endif