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 6461232b5dc385fff688ff9e17730f7caf0ccc71..96fe849a3d43007d8cc0014760562e7698048d4d 100644 (file)
--- 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 c23a40089462d669dab29648a3e78c252accda13..07ba17fa8b0e38918d9a7cc4ba308511f3fe473e 100644 (file)
--- 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 d2119a1df0b6433d1ca93e504892818bcbe37f47..6b2a8b08e0a24e0ec83f9059f00e5ad983b4efca 100644 (file)
--- 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 894ef8ee347c045828c806a01a2d9545908b23c7..836ff325a92804be95cdce7f0091f1251fa78986 100644 (file)
--- 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 1d6f7145289fb79eda719c470c8c3cbdff2b889e..d743ad554e8872c577e39ac1983752af06c506d9 100644 (file)
--- 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 894ef8ee347c045828c806a01a2d9545908b23c7..836ff325a92804be95cdce7f0091f1251fa78986 100644 (file)
--- 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 1d6f7145289fb79eda719c470c8c3cbdff2b889e..d743ad554e8872c577e39ac1983752af06c506d9 100644 (file)
--- 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);