OGL fixes; documentation fixes; dialog editor updates

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

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 2371b4c5cefd5d2e29f790034d2b1bf4c80bfb37..99d98fcdb888fb61f061191589f2e226576d71ec 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -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)


@@ -74,12 +91,13 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow)
 
 wxFrame::wxFrame()
 {
 
 wxFrame::wxFrame()
 {

-  m_doingOnSize = FALSE;

   m_frameMenuBar = NULL;
   m_frameStatusBar = NULL;
   m_frameToolBar = NULL;
   m_sizeSet = FALSE;
   m_addPrivateChild = FALSE;
   m_frameMenuBar = NULL;
   m_frameStatusBar = NULL;
   m_frameToolBar = NULL;
   m_sizeSet = FALSE;
   m_addPrivateChild = FALSE;

+  m_wxwindow = NULL;
+  m_mainWindow = NULL;

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


@@ -87,12 +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_doingOnSize = FALSE;

   m_frameMenuBar = NULL;
   m_frameStatusBar = NULL;
   m_frameToolBar = NULL;
   m_sizeSet = FALSE;
   m_addPrivateChild = FALSE;
   m_frameMenuBar = NULL;
   m_frameStatusBar = NULL;
   m_frameToolBar = NULL;
   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 );
 };


@@ -102,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 );


@@ -141,6 +156,9 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
   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 );


@@ -208,10 +226,11 @@ void wxFrame::GetClientSize( int *width, int *height ) const
   };
 };
 
   };
 };
 

-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;


@@ -238,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)
   {


@@ -252,18 +271,18 @@ void wxFrame::GtkOnSize( int x, int y, int width, int height )
   main_y += toolbar_height;
   main_height -= toolbar_height;
   
   main_y += toolbar_height;
   main_height -= toolbar_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 );
+  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 );
   };
 
   if (m_frameToolBar)
   {
     gtk_widget_set_usize( m_frameMenuBar->m_widget, width-2, wxMENU_HEIGHT-2 );
   };
 
   if (m_frameToolBar)
   {

-    gtk_widget_set_uposition( m_frameToolBar->m_widget, 1, wxMENU_HEIGHT );
+    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 );
   };
   
     gtk_widget_set_usize( m_frameToolBar->m_widget, width-2, toolbar_height );
   };
   


@@ -293,8 +312,7 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
     for(wxNode *node = GetChildren()->First(); node; node = node->Next())
     {
       wxWindow *win = (wxWindow *)node->Data();
     for(wxNode *node = GetChildren()->First(); node; node = node->Next())
     {
       wxWindow *win = (wxWindow *)node->Data();

-      if (!win->IsKindOf(CLASSINFO(wxFrame)) &&
-          !win->IsKindOf(CLASSINFO(wxDialog))
+      if (!IS_KIND_OF(win,wxFrame) && !IS_KIND_OF(win,wxDialog)

 #if 0  // not in m_children anyway
           && (win != m_frameMenuBar) &&
              (win != m_frameToolBar) &&
 #if 0  // not in m_children anyway
           && (win != m_frameMenuBar) &&
              (win != m_frameToolBar) &&


@@ -318,6 +336,20 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
 
 void wxFrame::AddChild( wxWindow *child )
 {
 
 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 );
   if (m_addPrivateChild)
   {
     gtk_myfixed_put( GTK_MYFIXED(m_mainWindow), child->m_widget, child->m_x, child->m_y );


@@ -376,11 +408,11 @@ wxMenuBar *wxFrame::GetMenuBar(void)
   return m_frameMenuBar;
 };
 
   return m_frameMenuBar;
 };
 

-wxToolBar *wxFrame::CreateToolBar( int style, int WXUNUSED(orientation), int WXUNUSED(rowsOrColumns) )
+wxToolBar *wxFrame::CreateToolBar( long style , wxWindowID id, const wxString& name )

 {
   m_addPrivateChild = TRUE;
   
 {
   m_addPrivateChild = TRUE;
   

-  m_frameToolBar = new wxToolBar( this, -1, wxDefaultPosition, wxDefaultSize, style );
+  m_frameToolBar = new wxToolBar( this, id, wxDefaultPosition, wxDefaultSize, style, name );

   
   m_addPrivateChild = FALSE;
   
   
   m_addPrivateChild = FALSE;
   


@@ -392,15 +424,16 @@ wxToolBar *wxFrame::GetToolBar(void)
   return m_frameToolBar;
 };
 
   return m_frameToolBar;
 };
 

-bool wxFrame::CreateStatusBar( int number )
+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 )


@@ -430,3 +463,16 @@ void wxFrame::SetSizeHints(int minW, int minH, int maxW, int maxH, int WXUNUSED(
     gdk_window_set_hints( m_wxwindow->window, -1, -1, 
                          minW, minH, maxW, maxH, GDK_HINT_MIN_SIZE | GDK_HINT_MIN_SIZE );
 }
     gdk_window_set_hints( m_wxwindow->window, -1, -1, 
                          minW, minH, maxW, maxH, GDK_HINT_MIN_SIZE | GDK_HINT_MIN_SIZE );
 }

+
+void wxFrame::SetIcon( const wxIcon &icon )
+{
+  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 );
+}
+