From c0f09a2e88168989a36c53e95ed225e2cf3f9ff0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 13 Sep 2000 12:25:42 +0000 Subject: [PATCH] 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 --- include/wx/gtk/frame.h | 2 ++ include/wx/gtk1/frame.h | 2 ++ src/generic/listctrl.cpp | 1 - src/generic/splash.cpp | 2 +- src/gtk/frame.cpp | 14 +++++++++++--- src/gtk1/frame.cpp | 14 +++++++++++--- 6 files changed, 27 insertions(+), 8 deletions(-) diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h index 5435810ab1..702f519005 100644 --- 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_isIconized; + 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 5435810ab1..702f519005 100644 --- 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_isIconized; + bool m_fsIsShowing; /* full screen */ long m_fsSaveStyle; long m_fsSaveFlag; diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index a1bc2cfdb4..ada740b307 100644 --- 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(); - wxRect itemRect; int lineSpacing = 0; wxListLineData *line = &m_lines[0]; diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp index a407dd1653..54c8982dc9 100644 --- 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; +#ifndef __WXGTK__ bool hiColour = (wxDisplayDepth() >= 16) ; -#ifndef __WXGTK__ if (bitmap.GetPalette() && !hiColour) { dc.SetPalette(* bitmap.GetPalette()); diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index 43d5161b18..43d5e07887 100644 --- 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 -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; } @@ -338,7 +340,9 @@ gtk_frame_map_callback( GtkWidget * WXUNUSED(widget), wxFrame *win ) //----------------------------------------------------------------------------- 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; } @@ -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)) { + wxFAIL_MSG( _T("not implemented") ); } bool wxFrame::IsMaximized() const { + wxFAIL_MSG( _T("not implemented") ); + return FALSE; } void wxFrame::Restore() { + wxFAIL_MSG( _T("not implemented") ); } void wxFrame::Iconize( bool iconize ) diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp index 43d5161b18..43d5e07887 100644 --- 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 -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; } @@ -338,7 +340,9 @@ gtk_frame_map_callback( GtkWidget * WXUNUSED(widget), wxFrame *win ) //----------------------------------------------------------------------------- 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; } @@ -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)) { + wxFAIL_MSG( _T("not implemented") ); } bool wxFrame::IsMaximized() const { + wxFAIL_MSG( _T("not implemented") ); + return FALSE; } void wxFrame::Restore() { + wxFAIL_MSG( _T("not implemented") ); } void wxFrame::Iconize( bool iconize ) -- 2.45.2