several fixes

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

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index 2e05c91f089f870b7d4e600085733614f18e6083..99d98fcdb888fb61f061191589f2e226576d71ec 100644 (file)
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -5,7 +5,7 @@
 // Created:     01/02/97
 // Id:
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Created:     01/02/97
 // Id:
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -16,6 +16,10 @@
 #include "wx/dialog.h"
 #include "wx/control.h"
 #include "wx/app.h"
 #include "wx/dialog.h"
 #include "wx/control.h"
 #include "wx/app.h"

+#include "wx/menu.h"
+#include "wx/toolbar.h"
+#include "wx/statusbr.h"
+#include "wx/mdi.h"

 #include "wx/gtk/win_gtk.h"
 
 const wxMENU_HEIGHT    = 28;
 #include "wx/gtk/win_gtk.h"
 
 const wxMENU_HEIGHT    = 28;


@@ -29,7 +33,7 @@ extern wxList wxPendingDelete;
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// size
+// set size

 
 void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win )
 {
 
 void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxFrame *win )
 {


@@ -62,6 +66,19 @@ bool gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(
   return TRUE;
 };
 
   return TRUE;
 };
 

+//-----------------------------------------------------------------------------
+// configure
+
+gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxFrame *win )
+{
+  if (!win->HasVMT()) return FALSE;
+  
+  win->m_x = event->x;
+  win->m_y = event->y;
+  
+  return FALSE;
+};
+

 //-----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(wxFrame, wxWindow)
 //-----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(wxFrame, wxWindow)


@@ -72,12 +89,15 @@ END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow)
 

-wxFrame::wxFrame(void)
+wxFrame::wxFrame()

 {
 {

-  m_doingOnSize = FALSE;

   m_frameMenuBar = NULL;
   m_frameStatusBar = NULL;
   m_frameMenuBar = NULL;
   m_frameStatusBar = NULL;

+  m_frameToolBar = NULL;

   m_sizeSet = FALSE;
   m_sizeSet = FALSE;

+  m_addPrivateChild = FALSE;
+  m_wxwindow = NULL;
+  m_mainWindow = NULL;

   wxTopLevelWindows.Insert( this );
 };
 
   wxTopLevelWindows.Insert( this );
 };
 


@@ -85,7 +105,13 @@ wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
       const wxPoint &pos, const wxSize &size,
       long style, const wxString &name )
 {
       const wxPoint &pos, const wxSize &size,
       long style, const wxString &name )
 {

+  m_frameMenuBar = NULL;
+  m_frameStatusBar = NULL;
+  m_frameToolBar = NULL;

   m_sizeSet = FALSE;
   m_sizeSet = FALSE;

+  m_addPrivateChild = FALSE;
+  m_wxwindow = NULL;
+  m_mainWindow = NULL;

   Create( parent, id, title, pos, size, style, name );
   wxTopLevelWindows.Insert( this );
 };
   Create( parent, id, title, pos, size, style, name );
   wxTopLevelWindows.Insert( this );
 };


@@ -95,13 +121,9 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
       long style, const wxString &name )
 {
   m_needParent = FALSE;
       long style, const wxString &name )
 {
   m_needParent = FALSE;

-  m_mainWindow = NULL;
-  m_wxwindow = NULL;

 
   PreCreation( parent, id, pos, size, style, name );
 
 
   PreCreation( parent, id, pos, size, style, name );
 

-  m_doingOnSize = FALSE;
-

   m_title = title;
 
   m_widget = gtk_window_new( GTK_WINDOW_TOPLEVEL );
   m_title = title;
 
   m_widget = gtk_window_new( GTK_WINDOW_TOPLEVEL );


@@ -131,12 +153,12 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
 
   gtk_container_add( GTK_CONTAINER(m_mainWindow), m_wxwindow );
 
 
   gtk_container_add( GTK_CONTAINER(m_mainWindow), m_wxwindow );
 

-  m_frameMenuBar = NULL;
-  m_frameStatusBar = NULL;
-

   gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
     GTK_SIGNAL_FUNC(gtk_frame_size_callback), (gpointer)this );
 
   gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
     GTK_SIGNAL_FUNC(gtk_frame_size_callback), (gpointer)this );
 

+  gtk_signal_connect( GTK_OBJECT(m_widget), "configure_event",
+    GTK_SIGNAL_FUNC(gtk_frame_configure_callback), (gpointer)this );
+    

   PostCreation();
 
   gtk_widget_realize( m_mainWindow );
   PostCreation();
 
   gtk_widget_realize( m_mainWindow );


@@ -144,7 +166,7 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
   return TRUE;
 };
 
   return TRUE;
 };
 

-wxFrame::~wxFrame(void)
+wxFrame::~wxFrame()

 {
   if (m_frameMenuBar) delete m_frameMenuBar;
   if (m_frameStatusBar) delete m_frameStatusBar;
 {
   if (m_frameMenuBar) delete m_frameMenuBar;
   if (m_frameStatusBar) delete m_frameStatusBar;


@@ -180,7 +202,7 @@ void wxFrame::OnCloseWindow( wxCloseEvent &event )
     }
 };
 
     }
 };
 

-bool wxFrame::Destroy(void)
+bool wxFrame::Destroy()

 {
   if (!wxPendingDelete.Member(this))
     wxPendingDelete.Append(this);
 {
   if (!wxPendingDelete.Member(this))
     wxPendingDelete.Append(this);


@@ -195,13 +217,20 @@ void wxFrame::GetClientSize( int *width, int *height ) const
   {
     if (m_frameMenuBar) (*height) -= wxMENU_HEIGHT;
     if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT;
   {
     if (m_frameMenuBar) (*height) -= wxMENU_HEIGHT;
     if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT;

+    if (m_frameToolBar)
+    {
+      int y = 0;
+      m_frameToolBar->GetSize( NULL, &y );
+      (*height) -= y;
+    }

   };
 };
 
   };
 };
 

-void wxFrame::GtkOnSize( int x, int y, int width, int height )
+void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )

 {
 {

-  m_x = x;
-  m_y = y;
+  // due to a bug in gtk, x,y are always 0
+  // m_x = x;
+  // m_y = y;

 
   if ((m_height == height) && (m_width == width) &&
       (m_sizeSet)) return;
 
   if ((m_height == height) && (m_width == width) &&
       (m_sizeSet)) return;


@@ -228,7 +257,7 @@ void wxFrame::GtkOnSize( int x, int y, int width, int height )
   // m_wxwindow just like any other window.
 
 //  not really needed
   // m_wxwindow just like any other window.
 
 //  not really needed

-  gtk_widget_set_usize( m_mainWindow, width, height );
+//  gtk_widget_set_usize( m_mainWindow, width, height );

 
   if (m_frameMenuBar)
   {
 
   if (m_frameMenuBar)
   {


@@ -236,15 +265,27 @@ void wxFrame::GtkOnSize( int x, int y, int width, int height )
     main_height -= wxMENU_HEIGHT;
   };
 
     main_height -= wxMENU_HEIGHT;
   };
 

-  gtk_widget_set_uposition( GTK_WIDGET(m_wxwindow), main_x, main_y );
-  gtk_widget_set_usize( GTK_WIDGET(m_wxwindow), main_width, main_height );
+  int toolbar_height = 0;
+  if (m_frameToolBar) m_frameToolBar->GetSize( NULL, &toolbar_height );
+  
+  main_y += toolbar_height;
+  main_height -= toolbar_height;
+  
+  gtk_myfixed_move( GTK_MYFIXED(m_mainWindow), m_wxwindow, main_x, main_y );
+  gtk_widget_set_usize( m_wxwindow, main_width, main_height );

 
   if (m_frameMenuBar)
   {
 
   if (m_frameMenuBar)
   {

-    gtk_widget_set_uposition( m_frameMenuBar->m_widget, 1, 1 );
+    gtk_myfixed_move( GTK_MYFIXED(m_mainWindow), m_frameMenuBar->m_widget, 1, 1 );

     gtk_widget_set_usize( m_frameMenuBar->m_widget, width-2, wxMENU_HEIGHT-2 );
   };
 
     gtk_widget_set_usize( m_frameMenuBar->m_widget, width-2, wxMENU_HEIGHT-2 );
   };
 

+  if (m_frameToolBar)
+  {
+    gtk_myfixed_move( GTK_MYFIXED(m_mainWindow), m_frameToolBar->m_widget, 1, wxMENU_HEIGHT );
+    gtk_widget_set_usize( m_frameToolBar->m_widget, width-2, toolbar_height );
+  };
+  

   if (m_frameStatusBar)
   {
     m_frameStatusBar->SetSize( 0, main_height-wxSTATUS_HEIGHT, width, wxSTATUS_HEIGHT );
   if (m_frameStatusBar)
   {
     m_frameStatusBar->SetSize( 0, main_height-wxSTATUS_HEIGHT, width, wxSTATUS_HEIGHT );


@@ -265,16 +306,16 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
     // no child: go out !
     if (!GetChildren()->First())
       return;
     // no child: go out !
     if (!GetChildren()->First())
       return;

-
+      

     // do we have exactly one child?
     wxWindow *child = NULL;
     for(wxNode *node = GetChildren()->First(); node; node = node->Next())
     {
       wxWindow *win = (wxWindow *)node->Data();
     // do we have exactly one child?
     wxWindow *child = NULL;
     for(wxNode *node = GetChildren()->First(); node; node = node->Next())
     {
       wxWindow *win = (wxWindow *)node->Data();

-      if (!win->IsKindOf(CLASSINFO(wxFrame)) &&
-          !win->IsKindOf(CLASSINFO(wxDialog))
-#if 0 // not in m_children anyway
+      if (!IS_KIND_OF(win,wxFrame) && !IS_KIND_OF(win,wxDialog)
+#if 0  // not in m_children anyway

           && (win != m_frameMenuBar) &&
           && (win != m_frameMenuBar) &&

+             (win != m_frameToolBar) &&

              (win != m_frameStatusBar)
 #endif
          )
              (win != m_frameStatusBar)
 #endif
          )


@@ -293,6 +334,39 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
   }
 };
 
   }
 };
 

+void wxFrame::AddChild( wxWindow *child )
+{
+  // wxFrame and wxDialog as children aren't placed into the parents
+  
+  if (IS_KIND_OF(child,wxMDIChildFrame)) printf( "wxFrame::AddChild error.\n" );
+  
+  if ( IS_KIND_OF(child,wxFrame) || IS_KIND_OF(child,wxDialog))
+  {
+    m_children.Append( child );
+    
+    if ((child->m_x != -1) && (child->m_y != -1))
+      gtk_widget_set_uposition( child->m_widget, child->m_x, child->m_y );
+      
+    return;
+  }
+  
+  if (m_addPrivateChild)
+  {
+    gtk_myfixed_put( GTK_MYFIXED(m_mainWindow), child->m_widget, child->m_x, child->m_y );
+      
+    gtk_widget_set_usize( child->m_widget, child->m_width, child->m_height );
+  }
+  else
+  {
+    m_children.Append( child );
+    
+    if (m_wxwindow)
+      gtk_myfixed_put( GTK_MYFIXED(m_wxwindow), child->m_widget, child->m_x, child->m_y );
+      
+    gtk_widget_set_usize( child->m_widget, child->m_width, child->m_height );
+  }    
+};
+

 static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
 {
   menu->SetInvokingWindow( win );
 static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
 {
   menu->SetInvokingWindow( win );


@@ -300,7 +374,8 @@ static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
   while (node)
   {
     wxMenuItem *menuitem = (wxMenuItem*)node->Data();
   while (node)
   {
     wxMenuItem *menuitem = (wxMenuItem*)node->Data();

-    if (menuitem->m_isSubMenu) SetInvokingWindow( menuitem->m_subMenu, win );
+    if (menuitem->IsSubMenu())
+      SetInvokingWindow( menuitem->GetSubMenu(), win );

     node = node->Next();
   };
 };
     node = node->Next();
   };
 };


@@ -328,15 +403,37 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar )
   }
 };
 
   }
 };
 

-bool wxFrame::CreateStatusBar( int number )
+wxMenuBar *wxFrame::GetMenuBar(void)
+{
+  return m_frameMenuBar;
+};
+
+wxToolBar *wxFrame::CreateToolBar( long style , wxWindowID id, const wxString& name )
+{
+  m_addPrivateChild = TRUE;
+  
+  m_frameToolBar = new wxToolBar( this, id, wxDefaultPosition, wxDefaultSize, style, name );
+  
+  m_addPrivateChild = FALSE;
+  
+  return m_frameToolBar;
+};
+
+wxToolBar *wxFrame::GetToolBar(void)
+{
+  return m_frameToolBar;
+};
+
+wxStatusBar* wxFrame::CreateStatusBar( int number, long style, wxWindowID id, const wxString& name )

 {
   if (m_frameStatusBar)
   delete m_frameStatusBar;
 
 {
   if (m_frameStatusBar)
   delete m_frameStatusBar;
 

-  m_frameStatusBar = new wxStatusBar( this, -1, wxPoint(0,0), wxSize(100,20) );
+  m_frameStatusBar = new wxStatusBar( this, id, wxPoint(0,0), wxSize(100,20), style, name );

 
   m_frameStatusBar->SetFieldsCount( number );
 
   m_frameStatusBar->SetFieldsCount( number );

-  return TRUE;
+  
+  return m_frameStatusBar;

 };
 
 void wxFrame::SetStatusText( const wxString &text, int number )
 };
 
 void wxFrame::SetStatusText( const wxString &text, int number )


@@ -354,70 +451,28 @@ wxStatusBar *wxFrame::GetStatusBar(void)
   return m_frameStatusBar;
 };
 
   return m_frameStatusBar;
 };
 

-wxMenuBar *wxFrame::GetMenuBar(void)
-{
-  return m_frameMenuBar;
-};
-

 void wxFrame::SetTitle( const wxString &title )
 {
   m_title = title;
   gtk_window_set_title( GTK_WINDOW(m_widget), title );
 };
 
 void wxFrame::SetTitle( const wxString &title )
 {
   m_title = title;
   gtk_window_set_title( GTK_WINDOW(m_widget), title );
 };
 

-wxString wxFrame::GetTitle(void) const
+void wxFrame::SetSizeHints(int minW, int minH, int maxW, int maxH, int WXUNUSED(incW) )

 {
 {

-  return (wxString&)m_title;
-};
-
-void wxFrame::OnIdle(wxIdleEvent& WXUNUSED(event))
-{
-  DoMenuUpdates();
+  if (m_wxwindow)
+    gdk_window_set_hints( m_wxwindow->window, -1, -1, 
+                         minW, minH, maxW, maxH, GDK_HINT_MIN_SIZE | GDK_HINT_MIN_SIZE );

 }
 
 }
 

-// Query app for menu item updates (called from OnIdle)
-void wxFrame::DoMenuUpdates(void)
+void wxFrame::SetIcon( const wxIcon &icon )

 {
 {

-  wxMenuBar* bar = GetMenuBar();
-  if (!bar) return;
-
-  wxNode *node = bar->m_menus.First();
-  while (node)
-  {
-    wxMenu* menu = (wxMenu*)node->Data();
-    DoMenuUpdates(menu);
-    
-    node = node->Next();
-  };
-}
-
-void wxFrame::DoMenuUpdates(wxMenu* menu)
-{
-  wxNode* node = menu->m_items.First();
-  while (node)
-  {
-    wxMenuItem* item = (wxMenuItem*) node->Data();
-    if ( !item->IsSeparator() )
-    {
-        wxWindowID id = item->GetId();
-      wxUpdateUIEvent event(id);
-      event.SetEventObject( this );
-
-      if (GetEventHandler()->ProcessEvent(event))
-      {
-        if (event.GetSetText())
-          menu->SetLabel(id, event.GetText());
-        if (event.GetSetChecked())
-          menu->Check(id, event.GetChecked());
-        if (event.GetSetEnabled())
-          menu->Enable(id, event.GetEnabled());
-      }
-
-      if (item->GetSubMenu())
-        DoMenuUpdates(item->GetSubMenu());
-    }
-    node = node->Next();
-  }
+  m_icon = icon;
+  if (!icon.Ok()) return;
+  
+  wxMask *mask = icon.GetMask();
+  GdkBitmap *bm = NULL;
+  if (mask) bm = mask->GetBitmap();
+  
+  gdk_window_set_icon( m_widget->window, NULL, icon.GetPixmap(), bm );

 }
 
 }
 

-