Made the applet code compile under GTK.

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

diff --git a/contrib/configure b/contrib/configure
index e20808c0c374a913f7c7c66403e75a6ba6c5920f..d5805d8ee45c188ae22f76dc2df944a0d78efc7e 100755 (executable)
--- a/contrib/configure
+++ b/contrib/configure
@@ -821,6 +821,7 @@ trap 'rm -fr `echo "
             src/canvas/Makefile
             src/gizmos/Makefile
             src/plot/Makefile
             src/canvas/Makefile
             src/gizmos/Makefile
             src/plot/Makefile

+            src/applet/Makefile

             samples/Makefile
             samples/mmedia/Makefile
             samples/ogl/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/gizmos/splittree/Makefile
             samples/xml/Makefile
             samples/plot/Makefile

+            samples/applet/Makefile

             utils/Makefile
             utils/wxrc/Makefile
             utils/wxrcedit/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/canvas/Makefile
             src/gizmos/Makefile
             src/plot/Makefile

+            src/applet/Makefile

             samples/Makefile
             samples/mmedia/Makefile
             samples/ogl/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/gizmos/splittree/Makefile
             samples/xml/Makefile
             samples/plot/Makefile

+            samples/applet/Makefile

             utils/Makefile
             utils/wxrc/Makefile
             utils/wxrcedit/Makefile
             utils/Makefile
             utils/wxrc/Makefile
             utils/wxrcedit/Makefile

diff --git a/contrib/configure.in b/contrib/configure.in
index eaf92dbd5085949ae7cbeb97f4360f9f65fc9160..c6399802e2ab11e16a88c3ce0e5a769611f1f7e5 100644 (file)
--- a/contrib/configure.in
+++ b/contrib/configure.in
@@ -46,6 +46,7 @@ AC_OUTPUT([
             src/canvas/Makefile
             src/gizmos/Makefile
             src/plot/Makefile
             src/canvas/Makefile
             src/gizmos/Makefile
             src/plot/Makefile

+            src/applet/Makefile

             samples/Makefile
             samples/mmedia/Makefile
             samples/ogl/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/gizmos/splittree/Makefile
             samples/xml/Makefile
             samples/plot/Makefile

+            samples/applet/Makefile

             utils/Makefile
             utils/wxrc/Makefile
             utils/wxrcedit/Makefile
             utils/Makefile
             utils/wxrc/Makefile
             utils/wxrcedit/Makefile

diff --git a/contrib/samples/Makefile.in b/contrib/samples/Makefile.in
index 93436487e413a15f5f1a92fe3e3ee22a33720687..af1e43ad6abfebcd0e04c75568274a461749190d 100644 (file)
--- a/contrib/samples/Makefile.in
+++ b/contrib/samples/Makefile.in
@@ -1,6 +1,6 @@
 # $Id$
 
 # $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
 
 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 (file)
index 0000000..08d399d
--- /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 c643edc12e40ea287023a8ce76407f199af34932..86907e99f6bed204e67647549c9487086aedc4b1 100644 (file)
--- a/contrib/samples/applet/applet.cpp
+++ b/contrib/samples/applet/applet.cpp
@@ -32,6 +32,8 @@
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif

+
+#include "wx/wx.h"

 #include "wx/applet/window.h"
 #include "applet.h"
 
 #include "wx/applet/window.h"
 #include "applet.h"
 

diff --git a/contrib/samples/applet/combobox.cpp b/contrib/samples/applet/combobox.cpp
index d828fda449b74d53c7efca32a710dfada5499ed2..60ed0948bce5a03e38b3b9e6debba015edcc7332 100644 (file)
--- a/contrib/samples/applet/combobox.cpp
+++ b/contrib/samples/applet/combobox.cpp
@@ -33,6 +33,8 @@
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif

+
+#include "wx/wx.h"

 #include "combobox.h"
 
 /*------------------------- Implementation --------------------------------*/
 #include "combobox.h"
 
 /*------------------------- Implementation --------------------------------*/

diff --git a/contrib/samples/applet/index.html b/contrib/samples/applet/index.html
index 73c09bc032adfc00de768f05c7bae953954d7c57..fcadda705ee3a82eaf0e51397887192b599faf07 100644 (file)
--- a/contrib/samples/applet/index.html
+++ b/contrib/samples/applet/index.html
@@ -1,9 +1,10 @@
 <html>
 <head><title>Widgets demo</title></head>
 <html>
 <head><title>Widgets demo</title></head>

-<body>
+<body text="#000000" bgcolor="#D0D0D0">
+

 <h3>wxHtmlWidgetCell demonstration</h3>
 
 <h3>wxHtmlWidgetCell demonstration</h3>
 

-There is binded window somewhere around. Enjoy it.
+There is an embedded window somewhere around. Enjoy it.

 
 <A HREF="about.html">About...</A>
 
 
 <A HREF="about.html">About...</A>
 

diff --git a/contrib/samples/applet/monitorapplet.cpp b/contrib/samples/applet/monitorapplet.cpp
index f26502c112145860adcbd9a7e828068f28954abe..7310c30616026074c7b3913e3d28c307681b3db7 100644 (file)
--- 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/wxprec.h"
 
 // Include private headers

+#include "wx/wx.h"

 #include "monitorapplet.h"
 
 /*---------------------------- Global variables ---------------------------*/
 #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++) {
 
     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);
             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++;
                 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++) {
     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);
             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++;
             }
                 selected = i;
             i++;
             }

diff --git a/contrib/src/Makefile.in b/contrib/src/Makefile.in
index 46646b5d86ce93bb6e9e088df5b9da25df30d826..b531e22864da4f820f3bdf2a2a689f601df42a9b 100644 (file)
--- a/contrib/src/Makefile.in
+++ b/contrib/src/Makefile.in
@@ -1,6 +1,6 @@
 # $Id$
 
 # $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
 
 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 (file)
index 0000000..57f524d
--- /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
+