1. wxFrame::IsIconized() fixed - seems to work

2. a couple of unused vars removed

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

diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index 5435810ab1ff21d250503397a2db31fb70349849..702f5190059f0f07f0a6083b4759bed75e285d93 100644 (file)
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -114,6 +114,8 @@ public:
     bool          m_toolBarDetached;
     bool          m_insertInClientArea;  /* not from within OnCreateXXX */
 
     bool          m_toolBarDetached;
     bool          m_insertInClientArea;  /* not from within OnCreateXXX */
 

+    bool          m_isIconized;
+

     bool          m_fsIsShowing;         /* full screen */
     long          m_fsSaveStyle;
     long          m_fsSaveFlag;
     bool          m_fsIsShowing;         /* full screen */
     long          m_fsSaveStyle;
     long          m_fsSaveFlag;

diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h
index 5435810ab1ff21d250503397a2db31fb70349849..702f5190059f0f07f0a6083b4759bed75e285d93 100644 (file)
--- a/include/wx/gtk1/frame.h
+++ b/include/wx/gtk1/frame.h
@@ -114,6 +114,8 @@ public:
     bool          m_toolBarDetached;
     bool          m_insertInClientArea;  /* not from within OnCreateXXX */
 
     bool          m_toolBarDetached;
     bool          m_insertInClientArea;  /* not from within OnCreateXXX */
 

+    bool          m_isIconized;
+

     bool          m_fsIsShowing;         /* full screen */
     long          m_fsSaveStyle;
     long          m_fsSaveFlag;
     bool          m_fsIsShowing;         /* full screen */
     long          m_fsSaveStyle;
     long          m_fsSaveFlag;

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index a1bc2cfdb4ee18cfa508dcf85eda6dcb99d859b9..ada740b3072b9d94d096e6a35fae58269437b57a 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -1648,7 +1648,6 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         dc.SetBrush(* wxTRANSPARENT_BRUSH);
 
         wxSize clientSize = GetClientSize();
         dc.SetBrush(* wxTRANSPARENT_BRUSH);
 
         wxSize clientSize = GetClientSize();

-        wxRect itemRect;

 
         int lineSpacing = 0;
         wxListLineData *line = &m_lines[0];
 
         int lineSpacing = 0;
         wxListLineData *line = &m_lines[0];

diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp
index a407dd1653ff7586e93575324fe97de2ea7340dc..54c8982dc9cc69983559a1161ed20e0441892962 100644 (file)
--- a/src/generic/splash.cpp
+++ b/src/generic/splash.cpp
@@ -116,9 +116,9 @@ static void wxDrawSplashBitmap(wxDC& dc, const wxBitmap& bitmap, int x, int y)
 {
     wxMemoryDC dcMem;
 
 {
     wxMemoryDC dcMem;
 

+#ifndef __WXGTK__

     bool hiColour = (wxDisplayDepth() >= 16) ;
     
     bool hiColour = (wxDisplayDepth() >= 16) ;
     

-#ifndef __WXGTK__

     if (bitmap.GetPalette() && !hiColour)
     {
         dc.SetPalette(* bitmap.GetPalette());
     if (bitmap.GetPalette() && !hiColour)
     {
         dc.SetPalette(* bitmap.GetPalette());

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 43d5161b181fd28b2d3129cff96f5905e8415e6d..43d5e0788781baf39cc8c8bcac7246d17deb86bb 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -328,7 +328,9 @@ gtk_frame_realized_callback( GtkWidget * WXUNUSED(widget), wxFrame *win )
 //-----------------------------------------------------------------------------
 
 static void
 //-----------------------------------------------------------------------------
 
 static void

-gtk_frame_map_callback( GtkWidget * WXUNUSED(widget), wxFrame *win )
+gtk_frame_map_callback( GtkWidget * WXUNUSED(widget),
+                        GdkEvent * WXUNUSED(event),
+                        wxFrame *win )

 {
     win->m_isIconized = FALSE;
 }
 {
     win->m_isIconized = FALSE;
 }


@@ -338,7 +340,9 @@ gtk_frame_map_callback( GtkWidget * WXUNUSED(widget), wxFrame *win )
 //-----------------------------------------------------------------------------
 
 static void
 //-----------------------------------------------------------------------------
 
 static void

-gtk_frame_unmap_callback( GtkWidget * WXUNUSED(widget), wxFrame *win )
+gtk_frame_unmap_callback( GtkWidget * WXUNUSED(widget),
+                          GdkEvent * WXUNUSED(event),
+                          wxFrame *win )

 {
     win->m_isIconized = TRUE;
 }
 {
     win->m_isIconized = TRUE;
 }


@@ -1130,20 +1134,24 @@ void wxFrame::SetIcon( const wxIcon &icon )
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// frame state: maximized/iconized/normal (TODO)
+// frame state: maximized/iconized/normal

 // ----------------------------------------------------------------------------
 
 void wxFrame::Maximize(bool WXUNUSED(maximize))
 {
 // ----------------------------------------------------------------------------
 
 void wxFrame::Maximize(bool WXUNUSED(maximize))
 {

+    wxFAIL_MSG( _T("not implemented") );

 }
 
 bool wxFrame::IsMaximized() const
 {
 }
 
 bool wxFrame::IsMaximized() const
 {

+    wxFAIL_MSG( _T("not implemented") );
+

     return FALSE;
 }
 
 void wxFrame::Restore()
 {
     return FALSE;
 }
 
 void wxFrame::Restore()
 {

+    wxFAIL_MSG( _T("not implemented") );

 }
 
 void wxFrame::Iconize( bool iconize )
 }
 
 void wxFrame::Iconize( bool iconize )

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index 43d5161b181fd28b2d3129cff96f5905e8415e6d..43d5e0788781baf39cc8c8bcac7246d17deb86bb 100644 (file)
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -328,7 +328,9 @@ gtk_frame_realized_callback( GtkWidget * WXUNUSED(widget), wxFrame *win )
 //-----------------------------------------------------------------------------
 
 static void
 //-----------------------------------------------------------------------------
 
 static void

-gtk_frame_map_callback( GtkWidget * WXUNUSED(widget), wxFrame *win )
+gtk_frame_map_callback( GtkWidget * WXUNUSED(widget),
+                        GdkEvent * WXUNUSED(event),
+                        wxFrame *win )

 {
     win->m_isIconized = FALSE;
 }
 {
     win->m_isIconized = FALSE;
 }


@@ -338,7 +340,9 @@ gtk_frame_map_callback( GtkWidget * WXUNUSED(widget), wxFrame *win )
 //-----------------------------------------------------------------------------
 
 static void
 //-----------------------------------------------------------------------------
 
 static void

-gtk_frame_unmap_callback( GtkWidget * WXUNUSED(widget), wxFrame *win )
+gtk_frame_unmap_callback( GtkWidget * WXUNUSED(widget),
+                          GdkEvent * WXUNUSED(event),
+                          wxFrame *win )

 {
     win->m_isIconized = TRUE;
 }
 {
     win->m_isIconized = TRUE;
 }


@@ -1130,20 +1134,24 @@ void wxFrame::SetIcon( const wxIcon &icon )
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// frame state: maximized/iconized/normal (TODO)
+// frame state: maximized/iconized/normal

 // ----------------------------------------------------------------------------
 
 void wxFrame::Maximize(bool WXUNUSED(maximize))
 {
 // ----------------------------------------------------------------------------
 
 void wxFrame::Maximize(bool WXUNUSED(maximize))
 {

+    wxFAIL_MSG( _T("not implemented") );

 }
 
 bool wxFrame::IsMaximized() const
 {
 }
 
 bool wxFrame::IsMaximized() const
 {

+    wxFAIL_MSG( _T("not implemented") );
+

     return FALSE;
 }
 
 void wxFrame::Restore()
 {
     return FALSE;
 }
 
 void wxFrame::Restore()
 {

+    wxFAIL_MSG( _T("not implemented") );

 }
 
 void wxFrame::Iconize( bool iconize )
 }
 
 void wxFrame::Iconize( bool iconize )