Upport wxMiniFrame corrections

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index ae4a5434185c358bda6b87594377e033759cb333..cfbd40bae093ec76af6eb5054e36a456bf0601a8 100644 (file)
--- a/src/gtk/minifram.cpp
+++ b/src/gtk/minifram.cpp
@@ -96,19 +96,22 @@ static gboolean gtk_window_own_expose_callback(GtkWidget* widget, GdkEventExpose
          (style & wxTINY_CAPTION_VERT)))
     {
         dc.SetFont( *wxSMALL_FONT );
          (style & wxTINY_CAPTION_VERT)))
     {
         dc.SetFont( *wxSMALL_FONT );

-        int height = dc.GetCharHeight();

 
         wxBrush brush( LightContrastColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT) ) );
         dc.SetBrush( brush );
         dc.SetPen( *wxTRANSPARENT_PEN );
 
         wxBrush brush( LightContrastColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT) ) );
         dc.SetBrush( brush );
         dc.SetPen( *wxTRANSPARENT_PEN );

-        dc.DrawRectangle( 3, 3, win->m_width - 7, height );
+        dc.DrawRectangle( win->m_miniEdge-1, 
+                          win->m_miniEdge-1, 
+                          win->m_width - (2*(win->m_miniEdge-1)),
+                          15  );

 
         dc.SetTextForeground( *wxWHITE );
 
         dc.SetTextForeground( *wxWHITE );

-        dc.DrawText( win->GetTitle(), 6, 3 );
+        dc.DrawText( win->GetTitle(), 6, 4 );

 
         if (style & wxCLOSE_BOX)
 
         if (style & wxCLOSE_BOX)

-            dc.DrawBitmap( win->m_closeButton, win->m_width-19, 2, true );
+            dc.DrawBitmap( win->m_closeButton, win->m_width-18, 3, true );

     }
     }

+    

     return false;
 }
 }
     return false;
 }
 }


@@ -162,12 +165,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
         }
     }
 
         }
     }
 

-    wxClientDC dc(win);
-    dc.SetFont( *wxSMALL_FONT );
-    int height = dc.GetCharHeight() + 1;
-
-
-    if (y > height) return TRUE;
+    if (y > win->m_miniEdge-1 + 15) return TRUE;

 
     gdk_window_raise( win->m_widget->window );
 
 
     gdk_window_raise( win->m_widget->window );