Fixes for gcc 2.95 and AIX.

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

include/wx/generic/statline.h

@@ -15,6 +15,8 @@
     #pragma interface
 #endif
 
+class wxStaticBox;
+
 // ----------------------------------------------------------------------------
 // wxStaticLine
 // ----------------------------------------------------------------------------

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.
-  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) {}

samples/config/conftest.cpp

@@ -142,7 +142,7 @@ MyFrame::MyFrame()
        : 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");

src/generic/statline.cpp

@@ -47,7 +47,7 @@ bool wxStaticLine::Create( wxWindow *parent,
                            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

src/motif/checkbox.cpp

@@ -52,18 +52,24 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
     else
         m_windowId = id;
 
+#if 0  // gcc 2.95 doesn't like this apparently    
     char* label1 = (label.IsNull() ? "" : (char*) (const char*) label);
-
     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,
-        XmNlabelString, text,
+        XmNlabelString, text(),
         NULL);
+#if 0    
     XmStringFree (text);
+#endif
     
     XtAddCallback ((Widget) m_mainWidget, XmNvalueChangedCallback, (XtCallbackProc) wxCheckBoxCallback,
         (XtPointer) this);

src/motif/stattext.cpp

@@ -47,14 +47,20 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
     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);
+#endif
     
     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);
+#endif // 0
+    
+    XmString text = XmStringCreateLtoR ((char *)(const char*)label, XmSTRING_DEFAULT_CHARSET);
     
     XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));