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

Increased version to 2.2.0,

Browse Source 
Fixed minor waste in wxSizerItem,
  Changed wxGTK internal timer settings so that
    idle time is really after GTK finished.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2000-06-09 18:46:33 +00:00
parent 59277cb364
commit 0f9a3aaea8
10 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/sizer.h
View File

@@ -95,11 +95,14 @@ public:
{ return m_border; }
wxObject* GetUserData()
{ return m_userData; }
wxPoint GetPosition()
{ return m_pos; }
protected:
wxWindow *m_window;
wxSizer *m_sizer;
wxSize m_size;
wxPoint m_pos;
wxSize m_minSize;
int m_option;
int m_border;

6
include/wx/version.h
View File

@@ -14,9 +14,9 @@
// Bump-up with each new version
#define wxMAJOR_VERSION 2
#define wxMINOR_VERSION 1
#define wxRELEASE_NUMBER 16
#define wxVERSION_STRING _T("wxWindows 2.1.16")
#define wxMINOR_VERSION 2
#define wxRELEASE_NUMBER 2
#define wxVERSION_STRING _T("wxWindows 2.2.0")
#define wxVERSION_NUMBER (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER
#define wxBETA_NUMBER 0
#define wxVERSION_FLOAT wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0)