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

move m_sizeSet out of wxWindow

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2007-05-19 18:25:15 +00:00
parent 949ff63e2f
commit 59678f3fae
5 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,6 +46,8 @@ protected:
virtual void DoMoveWindow(int x, int y, int width, int height); virtual void DoMoveWindow(int x, int y, int width, int height);
private: private:
bool m_sizeSet;
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxPopupWindow) DECLARE_DYNAMIC_CLASS(wxPopupWindow)
}; };

4
include/wx/gtk/toplevel.h
View File

@@ -103,6 +103,8 @@ public:
long m_gdkFunc, long m_gdkFunc,
m_gdkDecor; m_gdkDecor;
bool m_sizeSet;
// private gtk_timeout_add result for mimicing wxUSER_ATTENTION_INFO and // private gtk_timeout_add result for mimicing wxUSER_ATTENTION_INFO and
// wxUSER_ATTENTION_ERROR difference, -2 for no hint, -1 for ERROR hint, rest for GtkTimeout handle. // wxUSER_ATTENTION_ERROR difference, -2 for no hint, -1 for ERROR hint, rest for GtkTimeout handle.
int m_urgency_hint; int m_urgency_hint;
@@ -116,6 +118,8 @@ public:
// return the full size of the window without WM decorations // return the full size of the window without WM decorations
void GTKDoGetSize(int *width, int *height) const; void GTKDoGetSize(int *width, int *height) const;
void GtkUpdateSize() { m_sizeSet = false; }
protected: protected:
// common part of all ctors // common part of all ctors
void Init(); void Init();

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

@@ -220,12 +220,6 @@ public:
virtual void ApplyToolTip( GtkTooltips *tips, const wxChar *tip ); virtual void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
#endif // wxUSE_TOOLTIPS #endif // wxUSE_TOOLTIPS
// Called from GTK signal handlers. it indicates that
// the layouting functions have to be called later on
// (i.e. in idle time, implemented in OnInternalIdle() ).
void GtkUpdateSize() { m_sizeSet = false; }
// Called when a window should delay showing itself // Called when a window should delay showing itself
// until idle time. This partly mimmicks defered // until idle time. This partly mimmicks defered
// sizing under MSW. // sizing under MSW.
@@ -304,7 +298,6 @@ public:
bool m_nativeSizeEvent:1; // wxGLCanvas sends wxSizeEvent upon "alloc_size" bool m_nativeSizeEvent:1; // wxGLCanvas sends wxSizeEvent upon "alloc_size"
bool m_hasScrolling:1; bool m_hasScrolling:1;
bool m_hasVMT:1; bool m_hasVMT:1;
bool m_sizeSet:1;
bool m_resizing:1; bool m_resizing:1;
bool m_hasFocus:1; // true if == FindFocus() bool m_hasFocus:1; // true if == FindFocus()
bool m_isScrolling:1; // dragging scrollbar thumb? bool m_isScrolling:1; // dragging scrollbar thumb?

2
src/gtk/mdi.cpp
View File

@@ -424,7 +424,7 @@ void wxMDIChildFrame::SetTitle( const wxString &title )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
extern "C" { extern "C" {
static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win ) static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxMDIChildFrame *win )
{ {
if ((win->m_x == alloc->x) && if ((win->m_x == alloc->x) &&
(win->m_y == alloc->y) && (win->m_y == alloc->y) &&

1
src/gtk/window.cpp
View File

@@ -2246,7 +2246,6 @@ void wxWindowGTK::Init()
m_width = 0; m_width = 0;
m_height = 0; m_height = 0;
m_sizeSet = false;
m_hasVMT = false; m_hasVMT = false;
m_isBeingDeleted = false; m_isBeingDeleted = false;