From db157a6cf8052dcf4474abe9fc358761d9b2323d Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sun, 6 May 2001 17:41:54 +0000 Subject: [PATCH] Made the applet code compile under GTK. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/configure | 4 ++++ contrib/configure.in | 2 ++ contrib/samples/Makefile.in | 2 +- contrib/samples/applet/Makefile.in | 25 ++++++++++++++++++++++++ contrib/samples/applet/applet.cpp | 2 ++ contrib/samples/applet/combobox.cpp | 2 ++ contrib/samples/applet/index.html | 5 +++-- contrib/samples/applet/monitorapplet.cpp | 9 +++++---- contrib/src/Makefile.in | 2 +- contrib/src/applet/Makefile.in | 23 ++++++++++++++++++++++ 10 files changed, 68 insertions(+), 8 deletions(-) create mode 100644 contrib/samples/applet/Makefile.in create mode 100644 contrib/src/applet/Makefile.in diff --git a/contrib/configure b/contrib/configure index e20808c0c3..d5805d8ee4 100755 --- a/contrib/configure +++ b/contrib/configure @@ -821,6 +821,7 @@ trap 'rm -fr `echo " src/canvas/Makefile src/gizmos/Makefile src/plot/Makefile + src/applet/Makefile samples/Makefile samples/mmedia/Makefile samples/ogl/Makefile @@ -835,6 +836,7 @@ trap 'rm -fr `echo " samples/gizmos/splittree/Makefile samples/xml/Makefile samples/plot/Makefile + samples/applet/Makefile utils/Makefile utils/wxrc/Makefile utils/wxrcedit/Makefile @@ -926,6 +928,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile src/canvas/Makefile src/gizmos/Makefile src/plot/Makefile + src/applet/Makefile samples/Makefile samples/mmedia/Makefile samples/ogl/Makefile @@ -940,6 +943,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile samples/gizmos/splittree/Makefile samples/xml/Makefile samples/plot/Makefile + samples/applet/Makefile utils/Makefile utils/wxrc/Makefile utils/wxrcedit/Makefile diff --git a/contrib/configure.in b/contrib/configure.in index eaf92dbd50..c6399802e2 100644 --- a/contrib/configure.in +++ b/contrib/configure.in @@ -46,6 +46,7 @@ AC_OUTPUT([ src/canvas/Makefile src/gizmos/Makefile src/plot/Makefile + src/applet/Makefile samples/Makefile samples/mmedia/Makefile samples/ogl/Makefile @@ -60,6 +61,7 @@ AC_OUTPUT([ samples/gizmos/splittree/Makefile samples/xml/Makefile samples/plot/Makefile + samples/applet/Makefile utils/Makefile utils/wxrc/Makefile utils/wxrcedit/Makefile diff --git a/contrib/samples/Makefile.in b/contrib/samples/Makefile.in index 93436487e4..af1e43ad6a 100644 --- a/contrib/samples/Makefile.in +++ b/contrib/samples/Makefile.in @@ -1,6 +1,6 @@ # $Id$ -CONTRIB_SAMPLES=mmedia ogl stc gizmos canvas xml plot +CONTRIB_SAMPLES=mmedia ogl stc gizmos canvas xml plot applet all: @for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE)); done diff --git a/contrib/samples/applet/Makefile.in b/contrib/samples/applet/Makefile.in new file mode 100644 index 0000000000..08d399dcb9 --- /dev/null +++ b/contrib/samples/applet/Makefile.in @@ -0,0 +1,25 @@ +# +# File: Makefile.in +# Author: Julian Smart +# Created: 2000 +# Updated: +# Copyright: (c) 2000 Julian Smart +# +# "%W% %G%" +# +# Makefile for the multicell example (UNIX). + +top_srcdir = @top_srcdir@/.. +top_builddir = ../../.. +program_dir = contrib/samples/applet + +PROGRAM=monitor + +DATAFILES=about.html index.html + +OBJECTS=applet.o dialogs_wdr.o monitorapplet.o combobox.o + +APPEXTRALIBS=$(top_builddir)/lib/libapplet.@WX_TARGET_LIBRARY_TYPE@ +APPEXTRADEFS=-I$(top_srcdir)/contrib/include + +include $(top_builddir)/src/makeprog.env diff --git a/contrib/samples/applet/applet.cpp b/contrib/samples/applet/applet.cpp index c643edc12e..86907e99f6 100644 --- a/contrib/samples/applet/applet.cpp +++ b/contrib/samples/applet/applet.cpp @@ -32,6 +32,8 @@ #ifdef __BORLANDC__ #pragma hdrstop #endif + +#include "wx/wx.h" #include "wx/applet/window.h" #include "applet.h" diff --git a/contrib/samples/applet/combobox.cpp b/contrib/samples/applet/combobox.cpp index d828fda449..60ed0948bc 100644 --- a/contrib/samples/applet/combobox.cpp +++ b/contrib/samples/applet/combobox.cpp @@ -33,6 +33,8 @@ #ifdef __BORLANDC__ #pragma hdrstop #endif + +#include "wx/wx.h" #include "combobox.h" /*------------------------- Implementation --------------------------------*/ diff --git a/contrib/samples/applet/index.html b/contrib/samples/applet/index.html index 73c09bc032..fcadda705e 100644 --- a/contrib/samples/applet/index.html +++ b/contrib/samples/applet/index.html @@ -1,9 +1,10 @@ Widgets demo - + +

wxHtmlWidgetCell demonstration

-There is binded window somewhere around. Enjoy it. +There is an embedded window somewhere around. Enjoy it. About... diff --git a/contrib/samples/applet/monitorapplet.cpp b/contrib/samples/applet/monitorapplet.cpp index f26502c112..7310c30616 100644 --- a/contrib/samples/applet/monitorapplet.cpp +++ b/contrib/samples/applet/monitorapplet.cpp @@ -34,6 +34,7 @@ #include "wx/wxprec.h" // Include private headers +#include "wx/wx.h" #include "monitorapplet.h" /*---------------------------- Global variables ---------------------------*/ @@ -183,9 +184,9 @@ void MonitorApplet::ReadMfrList() m_Mfr->Clear(); for (m = m_Monitors,i = 0; m->m_Mfr[0] != 0; m++) { - if (stricmp(buf,m->m_Mfr) != 0) { + if (wxStricmp(buf,m->m_Mfr) != 0) { m_Mfr->Append(m->m_Mfr); - if (stricmp(m_Data->m_Monitor.m_Mfr,m->m_Mfr) == 0) + if (wxStricmp(m_Data->m_Monitor.m_Mfr,m->m_Mfr) == 0) selected = i; strcpy(buf,m->m_Mfr); i++; @@ -209,9 +210,9 @@ void MonitorApplet::ReadModelList( mfrStr = m_Mfr->GetStringSelection(); m_Model->Clear(); for (m = m_Monitors,i = 0; m->m_Mfr[0] != 0; m++) { - if (stricmp(mfrStr,m->m_Mfr) == 0) { + if (wxStricmp(mfrStr,m->m_Mfr) == 0) { m_Model->Append(m->m_Model); - if (selectCurrent && stricmp(m_Data->m_Monitor.m_Model,m->m_Model) == 0) + if (selectCurrent && wxStricmp(m_Data->m_Monitor.m_Model,m->m_Model) == 0) selected = i; i++; } diff --git a/contrib/src/Makefile.in b/contrib/src/Makefile.in index 46646b5d86..b531e22864 100644 --- a/contrib/src/Makefile.in +++ b/contrib/src/Makefile.in @@ -1,6 +1,6 @@ # $Id$ -CONTRIB_SUBDIRS=ogl mmedia stc xml +CONTRIB_SUBDIRS=ogl mmedia stc xml applet all: @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done diff --git a/contrib/src/applet/Makefile.in b/contrib/src/applet/Makefile.in new file mode 100644 index 0000000000..57f524d479 --- /dev/null +++ b/contrib/src/applet/Makefile.in @@ -0,0 +1,23 @@ +# $Id$ + +top_srcdir = @top_srcdir@/.. +top_builddir = ../../.. +libsrc_dir = contrib/src/applet + +TARGET_LIBNAME=libapplet + +LIBVERSION_CURRENT=1 +LIBVERSION_REVISION=0 +LIBVERSION_AGE=0 + +HEADER_PATH=$(top_srcdir)/contrib/include/wx +HEADER_SUBDIR=applet + +HEADERS=applet.h appletwindow.h + +OBJECTS=applet.o appletwindow.o + +APPEXTRADEFS=-I$(top_srcdir)/contrib/include + +include $(top_builddir)/src/makelib.env + -- 2.45.2