dthelp: Change to ANSI function definitions

[oweals/cde.git] / cde / programs / dtmail / dtmail / DmxPrintJob.C

diff --git a/cde/programs/dtmail/dtmail/DmxPrintJob.C b/cde/programs/dtmail/dtmail/DmxPrintJob.C
index f300585ae28abeb52827ecaf52fe22fea58a3626..14ae8ec0f1c37ad2b5e668f60209d5890bdab2f4 100644 (file)
--- a/cde/programs/dtmail/dtmail/DmxPrintJob.C
+++ b/cde/programs/dtmail/dtmail/DmxPrintJob.C
@@ -16,7 +16,7 @@
  * details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with these librararies and programs; if not, write
+ * License along with these libraries and programs; if not, write
  * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
  * Floor, Boston, MA 02110-1301 USA
  */
@@ -82,7 +82,9 @@
 #include <X11/Shell.h>
 #include <Xm/Xm.h>
 #include <Xm/PushB.h>
+#if 0 && defined(PRINTING_SUPPORTED)
 #include <Xm/Print.h>
+#endif /* PRINTING_SUPPORTED */
 #include "Dmx.h"
 #include "DmxPrintJob.h"
 #include "DmxPrintOptions.h"
@@ -310,7 +312,7 @@ DmxPrintJob::execute (void)
 void
 DmxPrintJob::createPrintShell (void)
 {
-#if defined(PRINTING_SUPPORTED)
+#if 0 && defined(PRINTING_SUPPORTED)
     DtMailEnv          dmxenv;
     DtMail::Session    *d_session = theRoamApp.session()->session();
 
@@ -459,7 +461,7 @@ ok_cb(DtMailGenDialog *genDialog)
 void
 DmxPrintJob::doPrint (void)
 {
-#if defined(PRINTING_SUPPORTED)
+#if 0 && defined(PRINTING_SUPPORTED)
     DtMailEnv          dmxenv;
     DtMail::Session    *d_session = theRoamApp.session()->session();
     XPSaveData         dest = XPSpool;
@@ -628,8 +630,7 @@ DmxPrintJob::loadOutputWidgets(void)
                _print_output->appendNewLine();
 
                XtFree(buffer);
-               if (NULL != separator_string)
-                 free((void*) separator_string);
+               free((void*) separator_string);
                
                break;
            }
@@ -670,7 +671,7 @@ DmxPrintJob::printOnePageCB(
                        XtPointer client_data,
                        XtPointer call_data)
 {
-#if defined(PRINTING_SUPPORTED)
+#if 0 && defined(PRINTING_SUPPORTED)
     DmxPrintJob                *thisJob = (DmxPrintJob *) client_data;
 
     XmPrintShellCallbackStruct *pscbs = (XmPrintShellCallbackStruct*)call_data;
@@ -978,6 +979,7 @@ DmxPrintJob::getPageHeaderString(
  * Name: DmxPrintJob::finishedPrintToFile
  * Description:
  */
+#if 0 && defined(PRINTING_SUPPORTED)
 void
 DmxPrintJob::finishedPrintToFile(
                        Display         *display,
@@ -1023,6 +1025,7 @@ DmxPrintJob::finishedPrintToFile(
     }
     thisJob->cancel();
 }
+#endif /* PRINTING_SUPPORTED */
 
 /*
  * Name: DmxPrintJob::cancelCB
@@ -1069,7 +1072,7 @@ DmxPrintJob::pdmNotificationCB(
                        XtPointer client_data,
                        XtPointer call_data)
 {
-#if defined(PRINTING_SUPPORTED)
+#if 0 && defined(PRINTING_SUPPORTED)
     DmxPrintJob                        *thisJob = (DmxPrintJob *) client_data;
     XmPrintShellCallbackStruct  *pscbs = (XmPrintShellCallbackStruct*)call_data;
     char                       *message = NULL;
@@ -1118,7 +1121,7 @@ DmxPrintJob::pdmSetupCB(
                XtPointer client_data,
                XtPointer call_data)
 {
-#if defined(PRINTING_SUPPORTED)
+#if 0 && defined(PRINTING_SUPPORTED)
     DmxPrintJob *thisJob = (DmxPrintJob *) client_data;
     DtPrintSetupCallbackStruct *pbs = (DtPrintSetupCallbackStruct *) call_data;