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

wxFrame size bug

Browse Source 
build fixes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 1998-11-25 08:41:17 +00:00
parent 1f481e6a25
commit 7f985bd39a
7 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/list.h
View File

@ -321,7 +321,7 @@ private:
nodetype(wxListBase *list = (wxListBase *)NULL, \ nodetype(wxListBase *list = (wxListBase *)NULL, \
nodetype *previous = (nodetype *)NULL, \ nodetype *previous = (nodetype *)NULL, \
nodetype *next = (nodetype *)NULL, \ nodetype *next = (nodetype *)NULL, \
T *data = NULL, \ T *data = (T *)NULL, \
const wxListKey& key = wxListKey()) \ const wxListKey& key = wxListKey()) \
: wxNodeBase(list, previous, next, data, key) { } \ : wxNodeBase(list, previous, next, data, key) { } \
\ \
@ -357,7 +357,7 @@ private:
T *operator[](size_t index) const \ T *operator[](size_t index) const \
{ \ { \
nodetype *node = Item(index); \ nodetype *node = Item(index); \
return node ? node->GetData() : NULL; \ return node ? (T*)(node->GetData()) : (T*)NULL; \
} \ } \
\ \
nodetype *Append(T *object) \ nodetype *Append(T *object) \

2
src/common/http.cpp
View File

@ -101,7 +101,7 @@ void wxHTTP::SendHeaders()
wxString *str = (wxString *)head->Data(); wxString *str = (wxString *)head->Data();
char buf[100]; char buf[100];
sprintf(buf, "%s: %s\n\r", head->GetKeyString()/*key.string*/, str->GetData()); sprintf(buf, "%s: %s\n\r", head->GetKeyString(), str->GetData());
Write(buf, strlen(buf)); Write(buf, strlen(buf));
head = head->Next(); head = head->Next();

3
src/gtk.inc
View File

@ -47,6 +47,7 @@ LIB_CPP_SRC=\
common/wincmn.cpp \ common/wincmn.cpp \
common/framecmn.cpp \ common/framecmn.cpp \
common/stream.cpp \ common/stream.cpp \
common/wfstream.cpp \
common/datstrm.cpp \ common/datstrm.cpp \
common/mstream.cpp \ common/mstream.cpp \
common/zstream.cpp \ common/zstream.cpp \
@ -60,8 +61,8 @@ LIB_CPP_SRC=\
common/sckaddr.cpp \ common/sckaddr.cpp \
common/sckipc.cpp \ common/sckipc.cpp \
common/protocol.cpp \ common/protocol.cpp \
common/ftp.cpp \
common/http.cpp \ common/http.cpp \
common/ftp.cpp \
common/url.cpp \ common/url.cpp \
common/tokenzr.cpp \ common/tokenzr.cpp \
\ \

2
src/gtk/frame.cpp
View File

@ -365,7 +365,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_minWidth; if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_minWidth;
if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_minHeight; if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_minHeight;
// gtk_widget_set_usize( m_widget, m_width, m_height ); gtk_widget_set_usize( m_widget, m_width, m_height );
// This emulates the new wxMSW behaviour // This emulates the new wxMSW behaviour

3
src/gtk/utilsres.cpp
View File

@ -165,7 +165,8 @@ void wxFlushResources(void)
wxNode *node = wxTheResourceCache->First(); wxNode *node = wxTheResourceCache->First();
while (node) { while (node) {
char *file = node->key.string; wxString str = node->GetKeyString();
char *file = WXSTRINGCAST str;
// If file doesn't exist, create it first. // If file doesn't exist, create it first.
(void)GetResourcePath(nameBuffer, file, TRUE); (void)GetResourcePath(nameBuffer, file, TRUE);

2
src/gtk1/frame.cpp
View File

@ -365,7 +365,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_minWidth; if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_minWidth;
if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_minHeight; if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_minHeight;
// gtk_widget_set_usize( m_widget, m_width, m_height ); gtk_widget_set_usize( m_widget, m_width, m_height );
// This emulates the new wxMSW behaviour // This emulates the new wxMSW behaviour

3
src/gtk1/utilsres.cpp
View File

@ -165,7 +165,8 @@ void wxFlushResources(void)
wxNode *node = wxTheResourceCache->First(); wxNode *node = wxTheResourceCache->First();
while (node) { while (node) {
char *file = node->key.string; wxString str = node->GetKeyString();
char *file = WXSTRINGCAST str;
// If file doesn't exist, create it first. // If file doesn't exist, create it first.
(void)GetResourcePath(nameBuffer, file, TRUE); (void)GetResourcePath(nameBuffer, file, TRUE);