More updates to the Debian packaging for wxPython, unicode and
the project name change. Applied patch from ABX to make tex2rtf unicode compatible, then removed wxSprintf lameness from it so it might actually work. Also modified it to return true from tex2rtf OnInit in console builds so the app will exit with a successful return code rather than always returning failure even when it succeeds. Implemented unicode capable wxCtime for glibc systems also needed by tex2rtf. Wrapped dde include in tex2rtf in a guard and assert that dde is MSW only in its forwarding header. Lowered the limit of maxlen in wxSprintf so it actually has a chance to segfault on people instead of failing silently and mysteriously with glibc. Silenced some other 'potentially uninitialised variable' warnings from gcc3, most of which were bogus, one potentially not so. Added missing newline at the end of fontdlg.cpp. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2,26 +2,43 @@
|
||||
// Name: tex2any.h
|
||||
// Purpose: tex2RTF conversion header
|
||||
// Author: Julian Smart
|
||||
// Modified by:
|
||||
// Modified by: Wlodzimiez ABX Skiba 2003/2004 Unicode support
|
||||
// Created: 7.9.93
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Julian Smart
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef NO_GUI
|
||||
#include "wx/app.h"
|
||||
#include "wx/frame.h"
|
||||
|
||||
class WXDLLEXPORT wxTextCtrl;
|
||||
#ifndef NO_GUI
|
||||
#include "wx/frame.h"
|
||||
#include "wx/textctrl.h"
|
||||
|
||||
#ifdef __WXMSW__
|
||||
#include "wx/dde.h"
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
// Define a new application type
|
||||
class MyApp: public wxApp
|
||||
class MyApp: public
|
||||
#ifndef NO_GUI
|
||||
wxApp
|
||||
#else
|
||||
wxAppConsole
|
||||
#endif
|
||||
{ public:
|
||||
bool OnInit();
|
||||
#ifdef NO_GUI
|
||||
int OnRun() { return EXIT_SUCCESS; }
|
||||
#else
|
||||
int OnExit();
|
||||
#endif
|
||||
};
|
||||
|
||||
#ifndef NO_GUI
|
||||
|
||||
// Define a new frame type
|
||||
class MyFrame: public wxFrame
|
||||
{ public:
|
||||
@@ -52,7 +69,6 @@ DECLARE_EVENT_TABLE()
|
||||
};
|
||||
|
||||
#ifdef __WXMSW__
|
||||
#include "wx/dde.h"
|
||||
|
||||
class Tex2RTFConnection: public wxDDEConnection
|
||||
{
|
||||
@@ -147,8 +163,8 @@ extern wxChar *RefName; // Reference file name
|
||||
extern wxChar *bulletFile;
|
||||
|
||||
#ifndef NO_GUI
|
||||
void ChooseOutputFile(bool force = FALSE);
|
||||
void ChooseInputFile(bool force = FALSE);
|
||||
void ChooseOutputFile(bool force = false);
|
||||
void ChooseInputFile(bool force = false);
|
||||
#endif
|
||||
|
||||
void RTFOnMacro(int macroId, int no_args, bool start);
|
||||
|
Reference in New Issue
Block a user