From: Robert Roebling <robert@roebling.de>
Date: Wed, 25 Nov 1998 08:41:17 +0000 (+0000)
Subject:   wxFrame size bug
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/7f985bd39a0605d8dea4b4b1abc717c5658209c6

  wxFrame size bug
  build fixes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/list.h b/include/wx/list.h
index 6461232b5d..96fe849a3d 100644
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -321,7 +321,7 @@ private:
         nodetype(wxListBase *list = (wxListBase *)NULL,                     \
                  nodetype *previous = (nodetype *)NULL,                     \
                  nodetype *next = (nodetype *)NULL,                         \
-                 T *data = NULL,                                            \
+                 T *data = (T *)NULL,                                       \
                  const wxListKey& key = wxListKey())                        \
             : wxNodeBase(list, previous, next, data, key) { }               \
                                                                             \
@@ -357,7 +357,7 @@ private:
         T *operator[](size_t index) const                                   \
         {                                                                   \
             nodetype *node = Item(index);                                   \
-            return node ? node->GetData() : NULL;                           \
+            return node ? (T*)(node->GetData()) : (T*)NULL;                 \
         }                                                                   \
                                                                             \
         nodetype *Append(T *object)                                         \
diff --git a/src/common/http.cpp b/src/common/http.cpp
index c23a400894..07ba17fa8b 100644
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -101,7 +101,7 @@ void wxHTTP::SendHeaders()
     wxString *str = (wxString *)head->Data();
     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));
 
     head = head->Next();
diff --git a/src/gtk.inc b/src/gtk.inc
index d2119a1df0..6b2a8b08e0 100644
--- a/src/gtk.inc
+++ b/src/gtk.inc
@@ -47,6 +47,7 @@ LIB_CPP_SRC=\
  common/wincmn.cpp \
  common/framecmn.cpp \
  common/stream.cpp \
+ common/wfstream.cpp \
  common/datstrm.cpp \
  common/mstream.cpp \
  common/zstream.cpp \
@@ -60,8 +61,8 @@ LIB_CPP_SRC=\
  common/sckaddr.cpp \
  common/sckipc.cpp \
  common/protocol.cpp \
- common/ftp.cpp \
  common/http.cpp \
+ common/ftp.cpp \
  common/url.cpp \
  common/tokenzr.cpp \
 \
diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 894ef8ee34..836ff325a9 100644
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -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_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
 
diff --git a/src/gtk/utilsres.cpp b/src/gtk/utilsres.cpp
index 1d6f714528..d743ad554e 100644
--- a/src/gtk/utilsres.cpp
+++ b/src/gtk/utilsres.cpp
@@ -165,7 +165,8 @@ void wxFlushResources(void)
 
     wxNode *node = wxTheResourceCache->First();
     while (node) {
-        char *file = node->key.string;
+        wxString str = node->GetKeyString();
+        char *file = WXSTRINGCAST str;
         // If file doesn't exist, create it first.
         (void)GetResourcePath(nameBuffer, file, TRUE);
 
diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index 894ef8ee34..836ff325a9 100644
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -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_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
 
diff --git a/src/gtk1/utilsres.cpp b/src/gtk1/utilsres.cpp
index 1d6f714528..d743ad554e 100644
--- a/src/gtk1/utilsres.cpp
+++ b/src/gtk1/utilsres.cpp
@@ -165,7 +165,8 @@ void wxFlushResources(void)
 
     wxNode *node = wxTheResourceCache->First();
     while (node) {
-        char *file = node->key.string;
+        wxString str = node->GetKeyString();
+        char *file = WXSTRINGCAST str;
         // If file doesn't exist, create it first.
         (void)GetResourcePath(nameBuffer, file, TRUE);