Fixes for gcc 2.95 and AIX.

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

diff --git a/include/wx/generic/statline.h b/include/wx/generic/statline.h
index 0058ddede8e17e22ff3d5215e19497741e2887aa..d8832381ac213c9bf638adf26eb0a1d7bba82056 100644 (file)
--- a/include/wx/generic/statline.h
+++ b/include/wx/generic/statline.h
@@ -15,6 +15,8 @@
     #pragma interface
 #endif
 
     #pragma interface
 #endif
 

+class wxStaticBox;
+

 // ----------------------------------------------------------------------------
 // wxStaticLine
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxStaticLine
 // ----------------------------------------------------------------------------

diff --git a/include/wx/helpbase.h b/include/wx/helpbase.h
index 32ed2987b0883e234c7629246b550ca9f61f7356..3ef8f7e1f949569766bf9006e8f2424fba0a0823 100644 (file)
--- a/include/wx/helpbase.h
+++ b/include/wx/helpbase.h
@@ -39,8 +39,8 @@ class WXDLLEXPORT wxHelpControllerBase: public wxObject
   // Must call this to set the filename and server name.
   // server is only required when implementing TCP/IP-based
   // help controllers.
   // Must call this to set the filename and server name.
   // server is only required when implementing TCP/IP-based
   // help controllers.

-  virtual bool Initialize(const wxString& WXUNUSED(file), int WXUNUSED(server) ) { return FALSE; };
-  virtual bool Initialize(const wxString& file) = 0;
+  virtual bool Initialize(const wxString& WXUNUSED(file), int WXUNUSED(server) ) { return FALSE; }
+  virtual bool Initialize(const wxString& file) { return FALSE; }

 
   // Set viewer: only relevant to some kinds of controller
   virtual void SetViewer(const wxString& WXUNUSED(viewer), long WXUNUSED(flags) = 0) {}
 
   // Set viewer: only relevant to some kinds of controller
   virtual void SetViewer(const wxString& WXUNUSED(viewer), long WXUNUSED(flags) = 0) {}

diff --git a/samples/config/conftest.cpp b/samples/config/conftest.cpp
index 37b8c1f5439efa31e0d3b6999af5c9d27852352d..0dbc6cd1488b48512268922cb93601bb626be2db 100644 (file)
--- a/samples/config/conftest.cpp
+++ b/samples/config/conftest.cpp
@@ -142,7 +142,7 @@ MyFrame::MyFrame()
        : wxFrame((wxFrame *) NULL, -1, "wxConfig Demo")
 {
   // submenu
        : wxFrame((wxFrame *) NULL, -1, "wxConfig Demo")
 {
   // submenu

-  wxMenu *sub_menu = new wxMenu( wxMENU_TEAROFF );
+  wxMenu *sub_menu = new wxMenu( wxEmptyString, wxMENU_TEAROFF );

   sub_menu->Append(Minimal_About, "&About", "About this sample");
   sub_menu->Append(Minimal_About, "&About", "About this sample");
   sub_menu->Append(Minimal_About, "&About", "About this sample");
   sub_menu->Append(Minimal_About, "&About", "About this sample");
   sub_menu->Append(Minimal_About, "&About", "About this sample");
   sub_menu->Append(Minimal_About, "&About", "About this sample");

diff --git a/src/generic/statline.cpp b/src/generic/statline.cpp
index 21ad8938524f9b29ffbf05684c485deef18698ee..f6872ff56a8fdec9607160401a94da4dc0e96e3e 100644 (file)
--- a/src/generic/statline.cpp
+++ b/src/generic/statline.cpp
@@ -47,7 +47,7 @@ bool wxStaticLine::Create( wxWindow *parent,
                            long style,
                            const wxString &name)
 {
                            long style,
                            const wxString &name)
 {

-    if ( !CreateBase(parent, id, pos, size, style, name) )
+    if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )

         return FALSE;
 
     // ok, this is ugly but it's better than nothing: use a thin static box to
         return FALSE;
 
     // ok, this is ugly but it's better than nothing: use a thin static box to

diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp
index 4b582b16c7efc4766a9d7e535c1f9e34b53d5f07..8018173cc2b46fe64ce6652ea27bddda75f7aa6c 100644 (file)
--- a/src/motif/checkbox.cpp
+++ b/src/motif/checkbox.cpp
@@ -52,19 +52,25 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
     else
         m_windowId = id;
 
     else
         m_windowId = id;
 

+#if 0  // gcc 2.95 doesn't like this apparently    

     char* label1 = (label.IsNull() ? "" : (char*) (const char*) label);
     char* label1 = (label.IsNull() ? "" : (char*) (const char*) label);

-

     XmString text = XmStringCreateSimple (label1);
     XmString text = XmStringCreateSimple (label1);

+#endif
+
+    wxXmString text( label );
+    

     Widget parentWidget = (Widget) parent->GetClientWidget();
     XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));
 
     m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("toggle",
         xmToggleButtonWidgetClass, parentWidget,
         XmNfontList, fontList,
     Widget parentWidget = (Widget) parent->GetClientWidget();
     XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));
 
     m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("toggle",
         xmToggleButtonWidgetClass, parentWidget,
         XmNfontList, fontList,

-        XmNlabelString, text,
+        XmNlabelString, text(),

         NULL);
         NULL);

+#if 0    

     XmStringFree (text);
     XmStringFree (text);

-
+#endif
+    

     XtAddCallback ((Widget) m_mainWidget, XmNvalueChangedCallback, (XtCallbackProc) wxCheckBoxCallback,
         (XtPointer) this);
 
     XtAddCallback ((Widget) m_mainWidget, XmNvalueChangedCallback, (XtCallbackProc) wxCheckBoxCallback,
         (XtPointer) this);
 

diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp
index fdcd50c98da8a3e6ec16f85967f10ba83dee8ec7..a5105b10ece5329865a7829fdc37271fc2fba84e 100644 (file)
--- a/src/motif/stattext.cpp
+++ b/src/motif/stattext.cpp
@@ -47,15 +47,21 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
     m_windowStyle = style;
     m_font = parent->GetFont();
 
     m_windowStyle = style;
     m_font = parent->GetFont();
 

+#if 0  // gcc 2.95 doesn't like this apparently    

     char* label1 = (label.IsNull() ? "" : (char*) (const char*) label);
     char* label1 = (label.IsNull() ? "" : (char*) (const char*) label);

-
+#endif
+    

     Widget parentWidget = (Widget) parent->GetClientWidget();
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 

+#if 0 // gcc 2.95 doesn't like this apparently    

     // Use XmStringCreateLtoR(), since XmStringCreateSimple
     // doesn't obey separators.
 //    XmString text = XmStringCreateSimple (label1);
     XmString text = XmStringCreateLtoR (label1, XmSTRING_DEFAULT_CHARSET);
     // Use XmStringCreateLtoR(), since XmStringCreateSimple
     // doesn't obey separators.
 //    XmString text = XmStringCreateSimple (label1);
     XmString text = XmStringCreateLtoR (label1, XmSTRING_DEFAULT_CHARSET);

-
+#endif // 0
+    
+    XmString text = XmStringCreateLtoR ((char *)(const char*)label, XmSTRING_DEFAULT_CHARSET);
+    

     XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));
 
     m_mainWidget = (WXWidget) XtVaCreateManagedWidget ((char*) (const char*) name,
     XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));
 
     m_mainWidget = (WXWidget) XtVaCreateManagedWidget ((char*) (const char*) name,