Let's face it, GTK's resizing is broken and
I cannot repair it. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -26,7 +26,8 @@
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// OS
|
||||
#if defined(__HPUX__) || defined(____SVR4____) || defined(__LINUX__) || defined(__sgi ) || defined(__unix__)
|
||||
#if defined(__HPUX__) || defined(____SVR4____) || defined(__LINUX__) || defined(__sgi ) || \
|
||||
defined(__unix__) || defined(sun) || defined(__SUN__)
|
||||
#ifndef __UNIX__
|
||||
#define __UNIX__
|
||||
#endif // Unix
|
||||
@@ -166,7 +167,7 @@
|
||||
typedef unsigned int bool;
|
||||
#endif
|
||||
|
||||
#elif defined(__SUNCC__)
|
||||
#elif defined(__SUNCC__) || defined(__SUNPRO_CC)
|
||||
#ifdef __SUNPRO_CC
|
||||
// starting from version 5.0 Sun CC understands 'bool'
|
||||
#if __SUNPRO_CC <= 0x0420
|
||||
|
@@ -41,7 +41,11 @@ public:
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
int nStrings = 0,
|
||||
#if defined(__SUNCC__)
|
||||
const wxString choices[] = NULL,
|
||||
#else
|
||||
const wxString choices[] = (const wxString *) NULL,
|
||||
#endif
|
||||
long style = 0,
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxListBoxNameStr);
|
||||
|
@@ -94,6 +94,7 @@ public:
|
||||
// implementation
|
||||
|
||||
virtual void GtkOnSize( int x, int y, int width, int height );
|
||||
virtual void OnInternalIdle();
|
||||
|
||||
bool m_modalShowing;
|
||||
wxString m_title;
|
||||
|
@@ -65,7 +65,7 @@ public:
|
||||
virtual void GetClientSize( int *width, int *height ) const;
|
||||
wxSize GetClientSize() const { int w, h; GetClientSize(& w, & h); return wxSize(w, h); }
|
||||
|
||||
virtual void SetClientSize( int const width, int const height );
|
||||
virtual void SetClientSize( int width, int height );
|
||||
|
||||
virtual void SetSize( int x, int y, int width, int height,
|
||||
int sizeFlags = wxSIZE_AUTO );
|
||||
|
@@ -63,7 +63,7 @@ public:
|
||||
GtkAdjustment *m_adjust;
|
||||
float m_oldPos;
|
||||
|
||||
DECLARE_EVENT_TABLE();
|
||||
DECLARE_EVENT_TABLE()
|
||||
};
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
@@ -152,7 +152,7 @@ public:
|
||||
virtual void GetSize( int *width, int *height ) const;
|
||||
wxSize GetSize() const { int w, h; GetSize(& w, & h); return wxSize(w, h); }
|
||||
|
||||
virtual void SetClientSize( int const width, int const height );
|
||||
virtual void SetClientSize( int width, int height );
|
||||
|
||||
virtual void GetClientSize( int *width, int *height ) const;
|
||||
wxSize GetClientSize() const { int w, h; GetClientSize(& w, & h); return wxSize(w, h); }
|
||||
|
@@ -41,7 +41,11 @@ public:
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
int nStrings = 0,
|
||||
#if defined(__SUNCC__)
|
||||
const wxString choices[] = NULL,
|
||||
#else
|
||||
const wxString choices[] = (const wxString *) NULL,
|
||||
#endif
|
||||
long style = 0,
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxListBoxNameStr);
|
||||
|
@@ -94,6 +94,7 @@ public:
|
||||
// implementation
|
||||
|
||||
virtual void GtkOnSize( int x, int y, int width, int height );
|
||||
virtual void OnInternalIdle();
|
||||
|
||||
bool m_modalShowing;
|
||||
wxString m_title;
|
||||
|
@@ -65,7 +65,7 @@ public:
|
||||
virtual void GetClientSize( int *width, int *height ) const;
|
||||
wxSize GetClientSize() const { int w, h; GetClientSize(& w, & h); return wxSize(w, h); }
|
||||
|
||||
virtual void SetClientSize( int const width, int const height );
|
||||
virtual void SetClientSize( int width, int height );
|
||||
|
||||
virtual void SetSize( int x, int y, int width, int height,
|
||||
int sizeFlags = wxSIZE_AUTO );
|
||||
|
@@ -63,7 +63,7 @@ public:
|
||||
GtkAdjustment *m_adjust;
|
||||
float m_oldPos;
|
||||
|
||||
DECLARE_EVENT_TABLE();
|
||||
DECLARE_EVENT_TABLE()
|
||||
};
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
@@ -152,7 +152,7 @@ public:
|
||||
virtual void GetSize( int *width, int *height ) const;
|
||||
wxSize GetSize() const { int w, h; GetSize(& w, & h); return wxSize(w, h); }
|
||||
|
||||
virtual void SetClientSize( int const width, int const height );
|
||||
virtual void SetClientSize( int width, int height );
|
||||
|
||||
virtual void GetClientSize( int *width, int *height ) const;
|
||||
wxSize GetClientSize() const { int w, h; GetClientSize(& w, & h); return wxSize(w, h); }
|
||||
|
Reference in New Issue
Block a user