Wed Jan 22 11:33:47 2004 Scott Harris <harris_s@ociweb.com>

4 files changed, 44 insertions, 7 deletions

diff --git a/TAO/utils/wxNamingViewer/Makefile b/TAO/utils/wxNamingViewer/Makefile
index d7097a6e6f8..f5fdc1a82bd 100644
--- a/TAO/utils/wxNamingViewer/Makefile
+++ b/TAO/utils/wxNamingViewer/Makefile
@@ -52,7 +52,11 @@ ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
     CPPFLAGS += $(PLATFORM_WXWINDOWS_CPPFLAGS)
     LDFLAGS  += $(PLATFORM_WXWINDOWS_LDFLAGS)
     LDLIBS   += $(PLATFORM_WXWINDOWS_LIBS)
+  else
+    all: require_warning
   endif # wxWindows
+else
+  all: comp_warning
 endif # Naming
 
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
@@ -64,6 +68,13 @@ include $(TAO_ROOT)/taoconfig.mk
 #----------------------------------------------------------------------------
 #	Local targets
 #----------------------------------------------------------------------------
+comp_warning:
+	@echo This project will not be built due to one of the following missing components:
+	@echo Naming
+
+require_warning:
+	@echo This project will not be built due to one of the following missing features:
+	@echo wxwindows
 
 #----------------------------------------------------------------------------
 #	Dependencies
diff --git a/TAO/utils/wxNamingViewer/README b/TAO/utils/wxNamingViewer/README
index 2d0f5ae8005..57cb9edb7b2 100644
--- a/TAO/utils/wxNamingViewer/README
+++ b/TAO/utils/wxNamingViewer/README
@@ -38,6 +38,17 @@ For Borland C++ Builder:
 *) Build the the dynamically linked release version of ACE and TAO. See
 http://www.tenermerx.com/programming/corba/tao_bcb/index.html.
 
+*) optionally use MPC to generate the makefile 
+
+  -) enable the wxwindows feature
+     vi $ACE_ROOT/bin/MakeProjectCreator/config/default.features
+     and add/change 
+      wxwindows     = 1
+
+  -) build the Makefile
+     cd $TAO_ROOT/utils
+     mwc.pl -type gnuace -recurse
+
 *) Make the wxNamingViewer using either the command line compiler with
 make -f makefile.b32 (set ACE_ROOT as usual; set BCCDIR to your C++ Builder
 install directory) or use the C++ Builder IDE (double-click on
@@ -53,7 +64,20 @@ For linux/gcc:
 
 *) Build the the dynamically linked release version of ACE and TAO.
 
+*) optionally use MPC to generate the makefile 
+
+  -) enable the wxwindows feature
+     vi $ACE_ROOT/bin/MakeProjectCreator/config/default.features
+     and add/change 
+      wxwindows     = 1
+
+  -) build the Makefile
+     cd $TAO_ROOT/utils
+     mwc.pl -type gnuace -recurse
+
 *) Make the wxNamingViewer with wxNamingView=1.
+   must have wxWindows=1 on make line or in 
+   $ACE_ROOT/include/makeinclude/platform_macros.GNU
 
 For others: (TBD)
 
diff --git a/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp b/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp
index 462ef46a7ad..3cf4f449e3f 100644
--- a/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp
+++ b/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp
@@ -11,6 +11,7 @@
 #include "orbsvcs/Naming/Naming_Utils.h"
 #include "wxNamingViewer.h"
 #include "wxSelectNSDialog.h"
+#include "ace/SString.h"
 
 #if defined(__WXGTK__) || defined(__WXMOTIF__)
 #include "mondrian.xpm"
@@ -127,7 +128,7 @@ void WxNamingViewerFrame::OnQuit( wxCommandEvent& WXUNUSED(event))
 
 void WxNamingViewerFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
-  wxString msg( 
+  wxString msg(
       "wxNamingViewer Version 1.1\n"
       "Author: Charlie Frasch <cfrasch@atdesk.com>");
 
diff --git a/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp b/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp
index a17aa725b4b..d2ee1b52b8d 100644
--- a/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp
+++ b/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp
@@ -13,13 +13,14 @@
 #include "wx/textctrl.h"
 #include "wx/treectrl.h"
 #include "wxNamingViewer.h"
+#include "ace/SString.h"
 
 namespace  // anonymous
 {
   void create_dialog_components( wxDialog* dialog)
     {
       wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL);
- 
+
       {
         wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL);
         sizer->Add(
@@ -42,7 +43,7 @@ namespace  // anonymous
                       0,
                       wxALIGN_LEFT | wxEXPAND);
       }
- 
+
       {
         wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL);
         sizer->Add(
@@ -65,7 +66,7 @@ namespace  // anonymous
                       0,
                       wxALIGN_LEFT | wxEXPAND);
       }
- 
+
       {
         wxTreeCtrl* profiles = new wxTreeCtrl(
                                               dialog,
@@ -80,7 +81,7 @@ namespace  // anonymous
                       wxALL | wxEXPAND,
                       5);
       }
-  
+
       wxBoxSizer* button_sizer = new wxBoxSizer( wxHORIZONTAL);
       {
         wxButton* okButton = new wxButton( dialog, wxID_OK, "OK" );
@@ -111,11 +112,11 @@ namespace  // anonymous
                     button_sizer,
                     0,
                     wxALIGN_CENTER);
- 
+
       dialog->SetSizer( topsizer);
       topsizer->SetSizeHints( dialog);
     }
- 
+
 };  // anonymous
 
 BEGIN_EVENT_TABLE( WxViewIORDialog, wxDialog)