X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3b9f782ef3949f583e8ac53795d36787f044fc3..eea4d01c65f9b29baa1193db762b4c6b8144af24:/src/gtk1/minifram.cpp?ds=sidebyside diff --git a/src/gtk1/minifram.cpp b/src/gtk1/minifram.cpp index 7f24e602ee..9014e2cd50 100644 --- a/src/gtk1/minifram.cpp +++ b/src/gtk1/minifram.cpp @@ -88,8 +88,7 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g if (!win->GetTitle().empty() && ((win->GetWindowStyle() & wxCAPTION) || - (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) || - (win->GetWindowStyle() & wxTINY_CAPTION_VERT))) + (win->GetWindowStyle() & wxTINY_CAPTION))) { wxClientDC dc(win); dc.SetFont( *wxSMALL_FONT ); @@ -134,8 +133,7 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU if (!win->GetTitle().empty() && ((win->GetWindowStyle() & wxCAPTION) || - (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) || - (win->GetWindowStyle() & wxTINY_CAPTION_VERT))) + (win->GetWindowStyle() & wxTINY_CAPTION))) { wxClientDC dc(win); dc.SetFont( *wxSMALL_FONT ); @@ -330,7 +328,7 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title { style = style | wxCAPTION; - if ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT)) + if ((style & wxCAPTION) || (style & wxTINY_CAPTION)) m_miniTitle = 13; m_miniEdge = 3; @@ -348,7 +346,7 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title } if ((style & wxSYSTEM_MENU) && - ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT))) + ((style & wxCAPTION) || (style & wxTINY_CAPTION))) { GdkBitmap *mask = NULL; GdkPixmap *pixmap = gdk_pixmap_create_from_xpm_d