AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Include wx/statusbr.h according to precompiled headers of wx/wx.h (with other minor cleaning).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2006-06-09 09:51:39 +00:00
parent ac2e7107d3
commit 3304646d06
23 changed files with 118 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
include/wx/generic/statusbr.h
View File

@ -12,6 +12,10 @@
#ifndef _WX_GENERIC_STATUSBR_H_ #ifndef _WX_GENERIC_STATUSBR_H_
#define _WX_GENERIC_STATUSBR_H_ #define _WX_GENERIC_STATUSBR_H_
#include "wx/defs.h"
#if wxUSE_STATUSBAR
#include "wx/pen.h" #include "wx/pen.h"
#include "wx/font.h" #include "wx/font.h"
#include "wx/statusbr.h" #include "wx/statusbr.h"
@ -22,104 +26,106 @@ extern WXDLLEXPORT_DATA(const wxChar) wxPanelNameStr[];
class WXDLLEXPORT wxStatusBarGeneric : public wxStatusBarBase class WXDLLEXPORT wxStatusBarGeneric : public wxStatusBarBase
{ {
public: public:
wxStatusBarGeneric() { Init(); } wxStatusBarGeneric() { Init(); }
wxStatusBarGeneric(wxWindow *parent, wxStatusBarGeneric(wxWindow *parent,
wxWindowID winid, wxWindowID winid,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxFULL_REPAINT_ON_RESIZE, long style = wxFULL_REPAINT_ON_RESIZE,
const wxString& name = wxPanelNameStr) const wxString& name = wxPanelNameStr)
{ {
Init(); Init();
Create(parent, winid, pos, size, style, name); Create(parent, winid, pos, size, style, name);
} }
wxStatusBarGeneric(wxWindow *parent, wxStatusBarGeneric(wxWindow *parent,
wxWindowID winid, wxWindowID winid,
long style, long style,
const wxString& name = wxPanelNameStr) const wxString& name = wxPanelNameStr)
{ {
Init(); Init();
Create(parent, winid, style, name); Create(parent, winid, style, name);
} }
virtual ~wxStatusBarGeneric(); virtual ~wxStatusBarGeneric();
bool Create(wxWindow *parent, wxWindowID winid, bool Create(wxWindow *parent, wxWindowID winid,
const wxPoint& WXUNUSED(pos) = wxDefaultPosition, const wxPoint& WXUNUSED(pos) = wxDefaultPosition,
const wxSize& WXUNUSED(size) = wxDefaultSize, const wxSize& WXUNUSED(size) = wxDefaultSize,
long style = wxFULL_REPAINT_ON_RESIZE, long style = wxFULL_REPAINT_ON_RESIZE,
const wxString& name = wxPanelNameStr) const wxString& name = wxPanelNameStr)
{ {
return Create(parent, winid, style, name); return Create(parent, winid, style, name);
} }
bool Create(wxWindow *parent, wxWindowID winid, bool Create(wxWindow *parent, wxWindowID winid,
long style, long style,
const wxString& name = wxPanelNameStr); const wxString& name = wxPanelNameStr);
// Create status line // Create status line
virtual void SetFieldsCount(int number = 1, virtual void SetFieldsCount(int number = 1,
const int *widths = (const int *) NULL); const int *widths = (const int *) NULL);
// Set status line text // Set status line text
virtual void SetStatusText(const wxString& text, int number = 0); virtual void SetStatusText(const wxString& text, int number = 0);
virtual wxString GetStatusText(int number = 0) const; virtual wxString GetStatusText(int number = 0) const;
// Set status line widths // Set status line widths
virtual void SetStatusWidths(int n, const int widths_field[]); virtual void SetStatusWidths(int n, const int widths_field[]);
// Get the position and size of the field's internal bounding rectangle // Get the position and size of the field's internal bounding rectangle
virtual bool GetFieldRect(int i, wxRect& rect) const; virtual bool GetFieldRect(int i, wxRect& rect) const;
// sets the minimal vertical size of the status bar // sets the minimal vertical size of the status bar
virtual void SetMinHeight(int height); virtual void SetMinHeight(int height);
virtual int GetBorderX() const { return m_borderX; } virtual int GetBorderX() const { return m_borderX; }
virtual int GetBorderY() const { return m_borderY; } virtual int GetBorderY() const { return m_borderY; }
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
// Implementation // Implementation
virtual void DrawFieldText(wxDC& dc, int i); virtual void DrawFieldText(wxDC& dc, int i);
virtual void DrawField(wxDC& dc, int i); virtual void DrawField(wxDC& dc, int i);
void SetBorderX(int x); void SetBorderX(int x);
void SetBorderY(int y); void SetBorderY(int y);
void OnPaint(wxPaintEvent& event); void OnPaint(wxPaintEvent& event);
void OnLeftDown(wxMouseEvent& event); void OnLeftDown(wxMouseEvent& event);
void OnRightDown(wxMouseEvent& event); void OnRightDown(wxMouseEvent& event);
virtual void InitColours(); virtual void InitColours();
// Responds to colour changes // Responds to colour changes
void OnSysColourChanged(wxSysColourChangedEvent& event); void OnSysColourChanged(wxSysColourChangedEvent& event);
protected: protected:
// common part of all ctors // common part of all ctors
void Init(); void Init();
wxArrayString m_statusStrings; wxArrayString m_statusStrings;
// the last known width of the client rect (used to rebuild cache) // the last known width of the client rect (used to rebuild cache)
int m_lastClientWidth; int m_lastClientWidth;
// the widths of the status bar panes in pixels // the widths of the status bar panes in pixels
wxArrayInt m_widthsAbs; wxArrayInt m_widthsAbs;
int m_borderX; int m_borderX;
int m_borderY; int m_borderY;
wxPen m_mediumShadowPen; wxPen m_mediumShadowPen;
wxPen m_hilightPen; wxPen m_hilightPen;
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const;
private: private:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBarGeneric) DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBarGeneric)
}; };
#endif // wxUSE_STATUSBAR
#endif #endif
// _WX_GENERIC_STATUSBR_H_ // _WX_GENERIC_STATUSBR_H_

3
include/wx/statusbr.h
View File

@ -12,10 +12,11 @@
#ifndef _WX_STATUSBR_H_BASE_ #ifndef _WX_STATUSBR_H_BASE_
#define _WX_STATUSBR_H_BASE_ #define _WX_STATUSBR_H_BASE_
#include "wx/window.h" #include "wx/defs.h"
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
#include "wx/window.h"
#include "wx/list.h" #include "wx/list.h"
#include "wx/dynarray.h" #include "wx/dynarray.h"

5
src/common/framecmn.cpp
View File

@ -30,11 +30,8 @@
#include "wx/menuitem.h" #include "wx/menuitem.h"
#include "wx/dcclient.h" #include "wx/dcclient.h"
#include "wx/toolbar.h" #include "wx/toolbar.h"
#endif // WX_PRECOMP
#if wxUSE_STATUSBAR
#include "wx/statusbr.h" #include "wx/statusbr.h"
#endif #endif // WX_PRECOMP
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// event table // event table

6
src/common/statbar.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Name: common/statbar.cpp // Name: src/common/statbar.cpp
// Purpose: wxStatusBarBase implementation // Purpose: wxStatusBarBase implementation
// Author: Vadim Zeitlin // Author: Vadim Zeitlin
// Modified by: // Modified by:
@ -24,9 +24,10 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#include "wx/statusbr.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/frame.h" #include "wx/frame.h"
#include "wx/statusbr.h"
#endif //WX_PRECOMP #endif //WX_PRECOMP
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
@ -354,4 +355,3 @@ wxListString *wxStatusBarBase::GetOrCreateStatusStack(int i)
} }
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR

4
src/generic/statusbr.cpp
View File

@ -18,6 +18,8 @@
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
#include "wx/statusbr.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/frame.h" #include "wx/frame.h"
#include "wx/settings.h" #include "wx/settings.h"
@ -29,8 +31,6 @@
#include "wx/gtk/win_gtk.h" #include "wx/gtk/win_gtk.h"
#endif #endif
#include "wx/statusbr.h"
// we only have to do it here when we use wxStatusBarGeneric in addition to the // we only have to do it here when we use wxStatusBarGeneric in addition to the
// standard wxStatusBar class, if wxStatusBarGeneric is the same as // standard wxStatusBar class, if wxStatusBarGeneric is the same as
// wxStatusBar, then the corresponding IMPLEMENT_DYNAMIC_CLASS is already in // wxStatusBar, then the corresponding IMPLEMENT_DYNAMIC_CLASS is already in

5
src/gtk/frame.cpp
View File

@ -27,11 +27,8 @@
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/control.h" #include "wx/control.h"
#include "wx/toolbar.h" #include "wx/toolbar.h"
#endif // WX_PRECOMP
#if wxUSE_STATUSBAR
#include "wx/statusbr.h" #include "wx/statusbr.h"
#endif #endif // WX_PRECOMP
#include <glib.h> #include <glib.h>
#include "wx/gtk/private.h" #include "wx/gtk/private.h"

2
src/gtk/window.cpp
View File

@ -31,6 +31,7 @@
#include "wx/toolbar.h" #include "wx/toolbar.h"
#include "wx/combobox.h" #include "wx/combobox.h"
#include "wx/layout.h" #include "wx/layout.h"
#include "wx/statusbr.h"
#endif #endif
#include "wx/module.h" #include "wx/module.h"
@ -47,7 +48,6 @@
#include "wx/caret.h" #include "wx/caret.h"
#endif // wxUSE_CARET #endif // wxUSE_CARET
#include "wx/statusbr.h"
#include "wx/fontutil.h" #include "wx/fontutil.h"
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__

5
src/gtk1/frame.cpp
View File

@ -27,11 +27,8 @@
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/control.h" #include "wx/control.h"
#include "wx/toolbar.h" #include "wx/toolbar.h"
#endif // WX_PRECOMP
#if wxUSE_STATUSBAR
#include "wx/statusbr.h" #include "wx/statusbr.h"
#endif #endif // WX_PRECOMP
#include <glib.h> #include <glib.h>
#include "wx/gtk1/private.h" #include "wx/gtk1/private.h"

2
src/gtk1/window.cpp
View File

@ -30,6 +30,7 @@
#include "wx/textctrl.h" #include "wx/textctrl.h"
#include "wx/combobox.h" #include "wx/combobox.h"
#include "wx/layout.h" #include "wx/layout.h"
#include "wx/statusbr.h"
#endif #endif
#include "wx/module.h" #include "wx/module.h"
@ -46,7 +47,6 @@
#include "wx/caret.h" #include "wx/caret.h"
#endif // wxUSE_CARET #endif // wxUSE_CARET
#include "wx/statusbr.h"
#include "wx/fontutil.h" #include "wx/fontutil.h"
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__

2
src/mac/carbon/frame.cpp
View File

@ -20,9 +20,9 @@
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/settings.h" #include "wx/settings.h"
#include "wx/toolbar.h" #include "wx/toolbar.h"
#include "wx/statusbr.h"
#endif // WX_PRECOMP #endif // WX_PRECOMP
#include "wx/statusbr.h"
#include "wx/menuitem.h" #include "wx/menuitem.h"
#include "wx/mac/uma.h" #include "wx/mac/uma.h"

2
src/mac/carbon/window.cpp
View File

@ -31,10 +31,10 @@
#include "wx/textctrl.h" #include "wx/textctrl.h"
#include "wx/toolbar.h" #include "wx/toolbar.h"
#include "wx/layout.h" #include "wx/layout.h"
#include "wx/statusbr.h"
#endif #endif
#include "wx/tooltip.h" #include "wx/tooltip.h"
#include "wx/statusbr.h"
#include "wx/menuitem.h" #include "wx/menuitem.h"
#include "wx/spinctrl.h" #include "wx/spinctrl.h"
#include "wx/geometry.h" #include "wx/geometry.h"

2
src/mac/classic/frame.cpp
View File

@ -20,9 +20,9 @@
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/settings.h" #include "wx/settings.h"
#include "wx/toolbar.h" #include "wx/toolbar.h"
#include "wx/statusbr.h"
#endif // WX_PRECOMP #endif // WX_PRECOMP
#include "wx/statusbr.h"
#include "wx/menuitem.h" #include "wx/menuitem.h"
#include "wx/mac/uma.h" #include "wx/mac/uma.h"

9
src/mac/classic/statbrma.cpp
View File

@ -9,6 +9,9 @@
// Licence: wxWindows licence // Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// headers // headers
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -88,14 +91,14 @@ void wxStatusBarMac::DrawField(wxDC& dc, int i)
void wxStatusBarMac::SetStatusText(const wxString& text, int number) void wxStatusBarMac::SetStatusText(const wxString& text, int number)
{ {
wxCHECK_RET( (number >= 0) && (number < m_nFields), wxCHECK_RET( (number >= 0) && (number < m_nFields),
_T("invalid status bar field index") ); _T("invalid status bar field index") );
m_statusStrings[number] = text; m_statusStrings[number] = text;
wxRect rect; wxRect rect;
GetFieldRect(number, rect); GetFieldRect(number, rect);
rect.y=0; rect.y=0;
rect.height = m_height ; rect.height = m_height ;
Refresh( TRUE , &rect ) ; Refresh( true , &rect ) ;
Update(); Update();
} }
@ -149,6 +152,6 @@ void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
void wxStatusBarMac::MacSuperEnabled( bool enabled ) void wxStatusBarMac::MacSuperEnabled( bool enabled )
{ {
Refresh(FALSE) ; Refresh(false) ;
wxWindow::MacSuperEnabled( enabled ) ; wxWindow::MacSuperEnabled( enabled ) ;
} }

2
src/mac/classic/window.cpp
View File

@ -30,12 +30,12 @@
#include "wx/statbox.h" #include "wx/statbox.h"
#include "wx/listbox.h" #include "wx/listbox.h"
#include "wx/layout.h" #include "wx/layout.h"
#include "wx/statusbr.h"
#endif #endif
#include "wx/notebook.h" #include "wx/notebook.h"
#include "wx/tabctrl.h" #include "wx/tabctrl.h"
#include "wx/tooltip.h" #include "wx/tooltip.h"
#include "wx/statusbr.h"
#include "wx/menuitem.h" #include "wx/menuitem.h"
#include "wx/spinctrl.h" #include "wx/spinctrl.h"
#include "wx/geometry.h" #include "wx/geometry.h"

3
src/motif/frame.cpp
View File

@ -36,10 +36,9 @@
#include "wx/icon.h" #include "wx/icon.h"
#include "wx/settings.h" #include "wx/settings.h"
#include "wx/toolbar.h" #include "wx/toolbar.h"
#include "wx/statusbr.h"
#endif #endif
#include "wx/statusbr.h"
#ifdef __VMS__ #ifdef __VMS__
#pragma message disable nosimpint #pragma message disable nosimpint
#endif #endif

6
src/msw/frame.cpp
View File

@ -37,6 +37,7 @@
#include "wx/panel.h" #include "wx/panel.h"
#include "wx/log.h" #include "wx/log.h"
#include "wx/toolbar.h" #include "wx/toolbar.h"
#include "wx/statusbr.h"
#endif // WX_PRECOMP #endif // WX_PRECOMP
#include "wx/msw/private.h" #include "wx/msw/private.h"
@ -50,10 +51,7 @@
#include "wx/msw/winundef.h" #include "wx/msw/winundef.h"
#endif #endif
#if wxUSE_STATUSBAR #include "wx/generic/statusbr.h"
#include "wx/statusbr.h"
#include "wx/generic/statusbr.h"
#endif // wxUSE_STATUSBAR
#include "wx/menuitem.h" #include "wx/menuitem.h"

4
src/msw/mdi.cpp
View File

@ -34,9 +34,7 @@
#include "wx/app.h" #include "wx/app.h"
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#if wxUSE_STATUSBAR #include "wx/statusbr.h"
#include "wx/statusbr.h"
#endif
#include "wx/settings.h" #include "wx/settings.h"
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/log.h" #include "wx/log.h"

15
src/os2/dc.cpp
View File

@ -24,10 +24,8 @@
#include "wx/icon.h" #include "wx/icon.h"
#include "wx/msgdlg.h" #include "wx/msgdlg.h"
#include "wx/dcprint.h" #include "wx/dcprint.h"
#if wxUSE_STATUSBAR
#include "wx/statusbr.h" #include "wx/statusbr.h"
#endif #endif
#endif
#include "wx/module.h" #include "wx/module.h"
@ -2729,12 +2727,10 @@ bool wxDC::DoBlit( wxCoord vXdest,
return bSuccess; return bSuccess;
} }
void wxDC::DoGetSize( void wxDC::DoGetSize( int* pnWidth,
int* pnWidth int* pnHeight ) const
, int* pnHeight
) const
{ {
LONG lArray[CAPS_HEIGHT]; LONG lArray[CAPS_HEIGHT];
if(::DevQueryCaps( m_hDC if(::DevQueryCaps( m_hDC
,CAPS_FAMILY ,CAPS_FAMILY
@ -2802,10 +2798,7 @@ wxSize wxDC::GetPPI() const
return ppisize; return ppisize;
} // end of wxDC::GetPPI } // end of wxDC::GetPPI
void wxDC::SetLogicalScale( void wxDC::SetLogicalScale( double dX, double dY )
double dX
, double dY
)
{ {
m_logicalScaleX = dX; m_logicalScaleX = dX;
m_logicalScaleY = dY; m_logicalScaleY = dY;

6
src/os2/frame.cpp
View File

@ -30,14 +30,12 @@
#include "wx/dcclient.h" #include "wx/dcclient.h"
#include "wx/mdi.h" #include "wx/mdi.h"
#include "wx/toolbar.h" #include "wx/toolbar.h"
#include "wx/statusbr.h"
#endif // WX_PRECOMP #endif // WX_PRECOMP
#include "wx/os2/private.h" #include "wx/os2/private.h"
#if wxUSE_STATUSBAR #include "wx/generic/statusbr.h"
#include "wx/statusbr.h"
#include "wx/generic/statusbr.h"
#endif // wxUSE_STATUSBAR
#include "wx/menuitem.h" #include "wx/menuitem.h"

6
src/palmos/frame.cpp
View File

@ -37,12 +37,10 @@
#include "wx/panel.h" #include "wx/panel.h"
#include "wx/log.h" #include "wx/log.h"
#include "wx/toolbar.h" #include "wx/toolbar.h"
#include "wx/statusbr.h"
#endif // WX_PRECOMP #endif // WX_PRECOMP
#if wxUSE_STATUSBAR #include "wx/generic/statusbr.h"
#include "wx/statusbr.h"
#include "wx/generic/statusbr.h"
#endif // wxUSE_STATUSBAR
#include "wx/menuitem.h" #include "wx/menuitem.h"

4
src/palmos/mdi.cpp
View File

@ -34,9 +34,7 @@
#include "wx/app.h" #include "wx/app.h"
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#if wxUSE_STATUSBAR #include "wx/statusbr.h"
#include "wx/statusbr.h"
#endif
#include "wx/settings.h" #include "wx/settings.h"
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/log.h" #include "wx/log.h"

6
src/univ/statusbr.cpp
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: univ/statusbr.cpp // Name: src/univ/statusbr.cpp
// Purpose: wxStatusBar implementation // Purpose: wxStatusBar implementation
// Author: Vadim Zeitlin // Author: Vadim Zeitlin
// Modified by: // Modified by:
@ -25,12 +25,13 @@
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
#include "wx/statusbr.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/settings.h" #include "wx/settings.h"
#include "wx/dcclient.h" #include "wx/dcclient.h"
#endif #endif
#include "wx/statusbr.h"
#include "wx/toplevel.h" #include "wx/toplevel.h"
#include "wx/univ/renderer.h" #include "wx/univ/renderer.h"
@ -327,4 +328,3 @@ int wxStatusBarUniv::GetBorderY() const
} }
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR

7
src/xrc/xh_statbar.cpp
View File

@ -23,14 +23,13 @@
#include "wx/string.h" #include "wx/string.h"
#include "wx/log.h" #include "wx/log.h"
#include "wx/frame.h" #include "wx/frame.h"
#include "wx/statusbr.h"
#endif #endif
#include "wx/statusbr.h"
IMPLEMENT_DYNAMIC_CLASS(wxStatusBarXmlHandler, wxXmlResourceHandler) IMPLEMENT_DYNAMIC_CLASS(wxStatusBarXmlHandler, wxXmlResourceHandler)
wxStatusBarXmlHandler::wxStatusBarXmlHandler() : wxStatusBarXmlHandler::wxStatusBarXmlHandler()
wxXmlResourceHandler() :wxXmlResourceHandler()
{ {
XRC_ADD_STYLE(wxST_SIZEGRIP); XRC_ADD_STYLE(wxST_SIZEGRIP);
AddWindowStyles(); AddWindowStyles();