Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
2. a couple of unused vars removed


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-09-13 12:25:42 +00:00
parent 43f5c4930f
commit c0f09a2e88
6 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/gtk/frame.h
View File

@@ -114,6 +114,8 @@ public:
bool m_toolBarDetached; bool m_toolBarDetached;
bool m_insertInClientArea; /* not from within OnCreateXXX */ bool m_insertInClientArea; /* not from within OnCreateXXX */
bool m_isIconized;
bool m_fsIsShowing; /* full screen */ bool m_fsIsShowing; /* full screen */
long m_fsSaveStyle; long m_fsSaveStyle;
long m_fsSaveFlag; long m_fsSaveFlag;

2
include/wx/gtk1/frame.h
View File

@@ -114,6 +114,8 @@ public:
bool m_toolBarDetached; bool m_toolBarDetached;
bool m_insertInClientArea; /* not from within OnCreateXXX */ bool m_insertInClientArea; /* not from within OnCreateXXX */
bool m_isIconized;
bool m_fsIsShowing; /* full screen */ bool m_fsIsShowing; /* full screen */
long m_fsSaveStyle; long m_fsSaveStyle;
long m_fsSaveFlag; long m_fsSaveFlag;

1
src/generic/listctrl.cpp
View File

@@ -1648,7 +1648,6 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
dc.SetBrush(* wxTRANSPARENT_BRUSH); dc.SetBrush(* wxTRANSPARENT_BRUSH);
wxSize clientSize = GetClientSize(); wxSize clientSize = GetClientSize();
wxRect itemRect;
int lineSpacing = 0; int lineSpacing = 0;
wxListLineData *line = &m_lines[0]; wxListLineData *line = &m_lines[0];

2
src/generic/splash.cpp
View File

@@ -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) if (bitmap.GetPalette() && !hiColour)
{ {
dc.SetPalette(* bitmap.GetPalette()); dc.SetPalette(* bitmap.GetPalette());

14
src/gtk/frame.cpp
View File

@@ -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; return FALSE;
} }
void wxFrame::Restore() void wxFrame::Restore()
{ {
wxFAIL_MSG( _T("not implemented") );
} }
void wxFrame::Iconize( bool iconize ) void wxFrame::Iconize( bool iconize )

14
src/gtk1/frame.cpp
View File

@@ -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; return FALSE;
} }
void wxFrame::Restore() void wxFrame::Restore()
{ {
wxFAIL_MSG( _T("not implemented") );
} }
void wxFrame::Iconize( bool iconize ) void wxFrame::Iconize( bool iconize )