removed 2nd frame from html test sample; test sample now shows DL,DT,DD support

[wxWidgets.git] / src / gtk1 / minifram.cpp

diff --git a/src/gtk1/minifram.cpp b/src/gtk1/minifram.cpp
index a59e05cd8d221f577a0e55237f2f1ac50ddc7bd1..36217adb2a4e1462e28152acfb27824ea606cd00 100644 (file)
--- a/src/gtk1/minifram.cpp
+++ b/src/gtk1/minifram.cpp
@@ -20,9 +20,9 @@
 #include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"
 
 #include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"
 

-#include "gdk/gdk.h"
-#include "gdk/gdkprivate.h"
-#include "gdk/gdkx.h"
+#include <gdk/gdk.h>
+#include <gdk/gdkprivate.h>
+#include <gdk/gdkx.h>

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -71,10 +71,10 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
     if (!win->m_hasVMT) return;
     if (gdk_event->count > 0) return;
     
     if (!win->m_hasVMT) return;
     if (gdk_event->count > 0) return;
     

-    GtkMyFixed *myfixed = GTK_MYFIXED(widget);
+    GtkPizza *pizza = GTK_PIZZA(widget);

     
     gtk_draw_shadow( widget->style, 
     
     gtk_draw_shadow( widget->style, 

-                     myfixed->bin_window,
+                     pizza->bin_window,

                      GTK_STATE_NORMAL,
                      GTK_SHADOW_OUT,
                      0, 0,
                      GTK_STATE_NORMAL,
                      GTK_SHADOW_OUT,
                      0, 0,


@@ -85,20 +85,20 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
          (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) || 
          (win->GetWindowStyle() & wxTINY_CAPTION_VERT)))
     {
          (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) || 
          (win->GetWindowStyle() & wxTINY_CAPTION_VERT)))
     {

-        GdkGC *gc = gdk_gc_new( myfixed->bin_window );
+        GdkGC *gc = gdk_gc_new( pizza->bin_window );

         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] );
         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( myfixed->bin_window, gc, TRUE, 
+        gdk_draw_rectangle( pizza->bin_window, gc, TRUE, 

                             x, 
                             3, 
                             win->m_width - 4 - x,
                             font->ascent + font->descent+1 );
                             
         gdk_gc_set_foreground( gc, &widget->style->white );
                             x, 
                             3, 
                             win->m_width - 4 - x,
                             font->ascent + font->descent+1 );
                             
         gdk_gc_set_foreground( gc, &widget->style->white );

-        gdk_draw_string( myfixed->bin_window, font, gc, 
+        gdk_draw_string( pizza->bin_window, font, gc, 

                          x+2, 
                          3+font->ascent, 
                          win->m_title.mb_str() );
                          x+2, 
                          3+font->ascent, 
                          win->m_title.mb_str() );


@@ -117,10 +117,10 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU
 
     if (!win->m_hasVMT) return;
     
 
     if (!win->m_hasVMT) return;
     

-    GtkMyFixed *myfixed = GTK_MYFIXED(widget);
+    GtkPizza *pizza = GTK_PIZZA(widget);

     
     gtk_draw_shadow( widget->style, 
     
     gtk_draw_shadow( widget->style, 

-                     myfixed->bin_window,
+                     pizza->bin_window,

                      GTK_STATE_NORMAL,
                      GTK_SHADOW_OUT,
                      0, 0,
                      GTK_STATE_NORMAL,
                      GTK_SHADOW_OUT,
                      0, 0,


@@ -131,20 +131,20 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU
          (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) || 
          (win->GetWindowStyle() & wxTINY_CAPTION_VERT)))
     {
          (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) || 
          (win->GetWindowStyle() & wxTINY_CAPTION_VERT)))
     {

-        GdkGC *gc = gdk_gc_new( myfixed->bin_window );
+        GdkGC *gc = gdk_gc_new( pizza->bin_window );

         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] );
         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( myfixed->bin_window, gc, TRUE, 
+        gdk_draw_rectangle( pizza->bin_window, gc, TRUE, 

                             x, 
                             3, 
                             win->m_width - 4 - x,
                             font->ascent + font->descent+1 );
                             
         gdk_gc_set_foreground( gc, &widget->style->white );
                             x, 
                             3, 
                             win->m_width - 4 - x,
                             font->ascent + font->descent+1 );
                             
         gdk_gc_set_foreground( gc, &widget->style->white );

-        gdk_draw_string( myfixed->bin_window, font, gc, 
+        gdk_draw_string( pizza->bin_window, font, gc, 

                          x+2, 
                          3+font->ascent, 
                          win->m_title.mb_str() );
                          x+2, 
                          3+font->ascent, 
                          win->m_title.mb_str() );


@@ -179,7 +179,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
                           GDK_BUTTON1_MOTION_MASK),
                       (GdkWindow *) NULL,
                       (GdkCursor *) NULL,
                           GDK_BUTTON1_MOTION_MASK),
                       (GdkWindow *) NULL,
                       (GdkCursor *) NULL,

-                      GDK_CURRENT_TIME );
+                      (unsigned int) GDK_CURRENT_TIME );

                      
     win->m_diffX = (int)gdk_event->x;
     win->m_diffY = (int)gdk_event->y;
                      
     win->m_diffX = (int)gdk_event->x;
     win->m_diffY = (int)gdk_event->y;


@@ -280,6 +280,7 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
       long style, const wxString &name )
 {
     style = style | wxSIMPLE_BORDER;
       long style, const wxString &name )
 {
     style = style | wxSIMPLE_BORDER;

+    style = style | wxCAPTION;

 
     if ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT))
         m_miniTitle = 13;
 
     if ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT))
         m_miniTitle = 13;


@@ -298,7 +299,7 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
     {
         GtkWidget *close_button = gtk_button_new_with_label( "x" );
     
     {
         GtkWidget *close_button = gtk_button_new_with_label( "x" );
     

-        gtk_myfixed_put( GTK_MYFIXED(m_mainWidget), 
+        gtk_pizza_put( GTK_PIZZA(m_mainWidget), 

                          close_button, 
                          4, 4, 12, 11 );
     
                          close_button, 
                          4, 4, 12, 11 );