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

Made wxWindowBase's variables protected again and such.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-05-10 21:04:17 +00:00
parent 36453d0ffb
commit 739730cae7
7 changed files with 258 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
include/wx/gtk/window.h
View File

@@ -143,19 +143,24 @@ public:
virtual bool IsOwnGtkWindow( GdkWindow *window );
void ConnectWidget( GtkWidget *widget );
// creates a new widget style if none is there
// and sets m_widgetStyle to this value.
GtkStyle *GetWidgetStyle();
// called by SetFont() and SetXXXColour etc
void SetWidgetStyle();
// overridden in many GTK widgets
virtual void ApplyWidgetStyle();
#if wxUSE_TOOLTIPS
virtual void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
#endif // wxUSE_TOOLTIPS
// called from GTK signales handlers
// called from GTK signales handlers. it indicates that
// the layouting functions have to be called later on
// (i.e. in idle time, implemented in OnInternalIdle() ).
void UpdateSize() { m_sizeSet = FALSE; }
void InternalSetPosition(int x, int y) { m_x = x; m_y = y; }
void InternalSetSize(int w, int h)
{ m_width = w; m_height = h; UpdateSize(); }
// position and size of the window
int m_x, m_y;
@@ -167,8 +172,13 @@ public:
// scrolling stuff
GtkAdjustment *m_hAdjust,*m_vAdjust;
float m_oldHorizontalPos,
m_oldVerticalPos;
float m_oldHorizontalPos;
float m_oldVerticalPos;
// we need an extra XGC flag set to get exposed
// events from overlapping children upon moving
// them. this flag will be set in this GC and
// the GC will be used in wxWindow::ScrollWindow().
GdkGC *m_scrollGC;
// extra (wxGTK-specific) flags
@@ -181,9 +191,28 @@ public:
bool m_isStaticBox:1; /* faster than IS_KIND_OF */
bool m_isFrame:1; /* faster than IS_KIND_OF */
bool m_acceptsFocus:1; /* ! wxStaticBox etc. */
// these are true if the style were set before the
// widget was realized (typcally in the constructor)
// but the actual GTK style must not be set before
// the widget has been "realized"
bool m_delayedFont:1;
bool m_delayedForegroundColour:1;
bool m_delayedBackgroundColour:1;
bool m_delayedCursor:1;
// contains GTK's widgets internal information
// about non-default widget font and colours.
// we create one for each widget that gets any
// non-default attribute set via SetFont() or
// SetForegroundColour() / SetBackgroundColour().
GtkStyle *m_widgetStyle;
// C++ has no virtual methods in the constrcutor
// of any class but we need different methods
// of inserting a child window into a wxFrame,
// wxMDIFrame, wxNotebook etc. this is the
// callback that will get used.
wxInsertChildFunction m_insertCallback;
// implement the base class pure virtuals

41
include/wx/gtk1/window.h
View File

@@ -143,19 +143,24 @@ public:
virtual bool IsOwnGtkWindow( GdkWindow *window );
void ConnectWidget( GtkWidget *widget );
// creates a new widget style if none is there
// and sets m_widgetStyle to this value.
GtkStyle *GetWidgetStyle();
// called by SetFont() and SetXXXColour etc
void SetWidgetStyle();
// overridden in many GTK widgets
virtual void ApplyWidgetStyle();
#if wxUSE_TOOLTIPS
virtual void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
#endif // wxUSE_TOOLTIPS
// called from GTK signales handlers
// called from GTK signales handlers. it indicates that
// the layouting functions have to be called later on
// (i.e. in idle time, implemented in OnInternalIdle() ).
void UpdateSize() { m_sizeSet = FALSE; }
void InternalSetPosition(int x, int y) { m_x = x; m_y = y; }
void InternalSetSize(int w, int h)
{ m_width = w; m_height = h; UpdateSize(); }
// position and size of the window
int m_x, m_y;
@@ -167,8 +172,13 @@ public:
// scrolling stuff
GtkAdjustment *m_hAdjust,*m_vAdjust;
float m_oldHorizontalPos,
m_oldVerticalPos;
float m_oldHorizontalPos;
float m_oldVerticalPos;
// we need an extra XGC flag set to get exposed
// events from overlapping children upon moving
// them. this flag will be set in this GC and
// the GC will be used in wxWindow::ScrollWindow().
GdkGC *m_scrollGC;
// extra (wxGTK-specific) flags
@@ -181,9 +191,28 @@ public:
bool m_isStaticBox:1; /* faster than IS_KIND_OF */
bool m_isFrame:1; /* faster than IS_KIND_OF */
bool m_acceptsFocus:1; /* ! wxStaticBox etc. */
// these are true if the style were set before the
// widget was realized (typcally in the constructor)
// but the actual GTK style must not be set before
// the widget has been "realized"
bool m_delayedFont:1;
bool m_delayedForegroundColour:1;
bool m_delayedBackgroundColour:1;
bool m_delayedCursor:1;
// contains GTK's widgets internal information
// about non-default widget font and colours.
// we create one for each widget that gets any
// non-default attribute set via SetFont() or
// SetForegroundColour() / SetBackgroundColour().
GtkStyle *m_widgetStyle;
// C++ has no virtual methods in the constrcutor
// of any class but we need different methods
// of inserting a child window into a wxFrame,
// wxMDIFrame, wxNotebook etc. this is the
// callback that will get used.
wxInsertChildFunction m_insertCallback;
// implement the base class pure virtuals

17
include/wx/window.h
View File

@@ -596,14 +596,10 @@ public:
void OnInitDialog( wxInitDialogEvent &event );
/*
What is this doing in the platform independent part?
// What is this doing in the platform independent part?
// No doc specifies this. Of what use would that be?
// accessors
WXWidget GetHandle() const { return m_widget; }
// the window handle (for the underlying windowing system) and the window
// id - a number which uniquely identifies a window among its siblings
// unless it is -1
// the window handle (for the underlying windowing system)
union
{
// we have 2 common names for this member, one for MSW and the other
@@ -611,8 +607,15 @@ public:
WXWidget m_widget;
WXWidget m_hWnd;
};
// accessor
WXWidget GetHandle() const { return m_widget; }
*/
protected:
// the window id - a number which uniquely identifies a window among
// its siblings unless it is -1
wxWindowID m_windowId;
// the parent window of this window (or NULL) and the list of the children