don't waste time initializing the memory of newly created wxImage before filling...

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

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index 75371738e9bff27bc767d503b6196121d08fd663..d2a5bdd6b12d45e12168caee3a2795e8aaaf9da5 100644 (file)
--- a/src/gtk1/toplevel.cpp
+++ b/src/gtk1/toplevel.cpp
@@ -30,7 +30,6 @@
 
 #include "wx/log.h"
 #include "wx/dialog.h"
 
 #include "wx/log.h"
 #include "wx/dialog.h"

-#include "wx/msgdlg.h"

 #include "wx/control.h"
 #include "wx/app.h"
 #include "wx/dcclient.h"
 #include "wx/control.h"
 #include "wx/app.h"
 #include "wx/dcclient.h"


@@ -107,7 +106,6 @@ static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
 
         win->m_width = alloc->width;
         win->m_height = alloc->height;
 
         win->m_width = alloc->width;
         win->m_height = alloc->height;

-        win->m_queuedFullRedraw = TRUE;

         win->GtkUpdateSize();
     }
 }
         win->GtkUpdateSize();
     }
 }


@@ -266,7 +264,7 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW
 
 /* Callback for wxTopLevelWindowGTK. This very strange beast has to be used because
  * C++ has no virtual methods in a constructor. We have to emulate a
 
 /* Callback for wxTopLevelWindowGTK. This very strange beast has to be used because
  * C++ has no virtual methods in a constructor. We have to emulate a

- * virtual function here as wxWindows requires different ways to insert
+ * virtual function here as wxWidgets requires different ways to insert

  * a child in container classes. */
 
 static void wxInsertChildInTopLevelWindow( wxTopLevelWindowGTK* parent, wxWindow* child )
  * a child in container classes. */
 
 static void wxInsertChildInTopLevelWindow( wxTopLevelWindowGTK* parent, wxWindow* child )


@@ -346,23 +344,34 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
 
     m_insertCallback = (wxInsertChildFunction) wxInsertChildInTopLevelWindow;
 
 
     m_insertCallback = (wxInsertChildFunction) wxInsertChildInTopLevelWindow;
 

-    GtkWindowType win_type = GTK_WINDOW_TOPLEVEL;
-
-    if (style & wxFRAME_TOOL_WINDOW)
-        win_type = GTK_WINDOW_POPUP;
-
-    if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
+    // NB: m_widget may be !=NULL if it was created by derived class' Create,
+    //     e.g. in wxTaskBarIconAreaGTK
+    if (m_widget == NULL)

     {
     {

-        // there is no more GTK_WINDOW_DIALOG in 2.0
+        GtkWindowType win_type = GTK_WINDOW_TOPLEVEL;
+        if (style & wxFRAME_TOOL_WINDOW)
+            win_type = GTK_WINDOW_POPUP;
+
+        if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
+        {

 #ifdef __WXGTK20__
 #ifdef __WXGTK20__

-        win_type = GTK_WINDOW_TOPLEVEL;
+            m_widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+            // Tell WM that this is a dialog window and make it center
+            // on parent by default (this is what GtkDialog ctor does):
+            gtk_window_set_type_hint(GTK_WINDOW(m_widget),
+                                     GDK_WINDOW_TYPE_HINT_DIALOG);
+            gtk_window_set_position(GTK_WINDOW(m_widget),
+                                    GTK_WIN_POS_CENTER_ON_PARENT);

 #else
 #else

-        win_type = GTK_WINDOW_DIALOG;
+            m_widget = gtk_window_new(GTK_WINDOW_DIALOG);

 #endif
 #endif

+        }
+        else
+        {
+            m_widget = gtk_window_new(win_type);
+        }

     }
 
     }
 

-    m_widget = gtk_window_new( win_type );
-

     if (m_parent && (((GTK_IS_WINDOW(m_parent->m_widget)) &&
                      (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)) ||
                     (style & wxFRAME_FLOAT_ON_PARENT)))
     if (m_parent && (((GTK_IS_WINDOW(m_parent->m_widget)) &&
                      (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)) ||
                     (style & wxFRAME_FLOAT_ON_PARENT)))


@@ -370,6 +379,13 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
         gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(m_parent->m_widget) );
     }
 
         gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(m_parent->m_widget) );
     }
 

+#if GTK_CHECK_VERSION(2,2,0)
+    if (style & wxFRAME_NO_TASKBAR)
+    {
+        gtk_window_set_skip_taskbar_hint(GTK_WINDOW(m_widget), TRUE);
+    }
+#endif
+

     if (!name.IsEmpty())
         gtk_window_set_wmclass( GTK_WINDOW(m_widget), wxGTK_CONV( name ), wxGTK_CONV( name ) );
 
     if (!name.IsEmpty())
         gtk_window_set_wmclass( GTK_WINDOW(m_widget), wxGTK_CONV( name ), wxGTK_CONV( name ) );
 


@@ -580,7 +596,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
 
 bool wxTopLevelWindowGTK::Show( bool show )
 {
 
 bool wxTopLevelWindowGTK::Show( bool show )
 {

-    wxCHECK_VALID_WIDGET(FALSE);
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );

 
     if (show && !m_sizeSet)
     {
 
     if (show && !m_sizeSet)
     {


@@ -602,8 +618,8 @@ void wxTopLevelWindowGTK::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXU
 
 void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {
 
 void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {

-    wxCHECK_VALID_WIDGET_RET();
-    
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
+

     // this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow
     wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
 
     // this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow
     wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
 


@@ -689,8 +705,8 @@ void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int si
 
 void wxTopLevelWindowGTK::DoGetClientSize( int *width, int *height ) const
 {
 
 void wxTopLevelWindowGTK::DoGetClientSize( int *width, int *height ) const
 {

-    wxCHECK_VALID_WIDGET_RET();
-    
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
+

     wxWindow::DoGetClientSize( width, height );
     if (height)
     {
     wxWindow::DoGetClientSize( width, height );
     if (height)
     {


@@ -705,7 +721,7 @@ void wxTopLevelWindowGTK::DoGetClientSize( int *width, int *height ) const
 
 void wxTopLevelWindowGTK::DoSetClientSize( int width, int height )
 {
 
 void wxTopLevelWindowGTK::DoSetClientSize( int width, int height )
 {

-    wxCHECK_VALID_WIDGET_RET();
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );

 
     DoSetSize(-1, -1,
               width + m_miniEdge*2, height  + m_miniEdge*2 + m_miniTitle, 0);
 
     DoSetSize(-1, -1,
               width + m_miniEdge*2, height  + m_miniEdge*2 + m_miniTitle, 0);


@@ -861,8 +877,8 @@ void wxTopLevelWindowGTK::OnInternalIdle()
 
 void wxTopLevelWindowGTK::SetTitle( const wxString &title )
 {
 
 void wxTopLevelWindowGTK::SetTitle( const wxString &title )
 {

-    wxCHECK_VALID_WIDGET_RET();
-    
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
+

     m_title = title;
     gtk_window_set_title( GTK_WINDOW(m_widget), wxGTK_CONV( title ) );
 }
     m_title = title;
     gtk_window_set_title( GTK_WINDOW(m_widget), wxGTK_CONV( title ) );
 }


@@ -889,7 +905,7 @@ void wxTopLevelWindowGTK::SetIcon( const wxIcon &icon )
 
 void wxTopLevelWindowGTK::SetIcons( const wxIconBundle &icons )
 {
 
 void wxTopLevelWindowGTK::SetIcons( const wxIconBundle &icons )
 {

-    wxCHECK_VALID_WIDGET_RET();
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );

     GdkWindow* window = m_widget->window;
 
     wxTopLevelWindowBase::SetIcons( icons );
     GdkWindow* window = m_widget->window;
 
     wxTopLevelWindowBase::SetIcons( icons );


@@ -920,15 +936,22 @@ void wxTopLevelWindowGTK::Maximize(bool maximize)
 
 bool wxTopLevelWindowGTK::IsMaximized() const
 {
 
 bool wxTopLevelWindowGTK::IsMaximized() const
 {

+#ifdef __WXGTK20__
+    if(!m_widget->window)
+        return false;
+
+    return gdk_window_get_state(m_widget->window) & GDK_WINDOW_STATE_MAXIMIZED;
+#else

   //    wxFAIL_MSG( _T("not implemented") );
 
     // This is an approximation
     return FALSE;
   //    wxFAIL_MSG( _T("not implemented") );
 
     // This is an approximation
     return FALSE;

+#endif

 }
 
 void wxTopLevelWindowGTK::Restore()
 {
 }
 
 void wxTopLevelWindowGTK::Restore()
 {

-#ifdef __GTK20__
+#ifdef __WXGTK20__

     // "Present" seems similar enough to "restore"
     gtk_window_present( GTK_WINDOW( m_widget ) );
 #else
     // "Present" seems similar enough to "restore"
     gtk_window_present( GTK_WINDOW( m_widget ) );
 #else