Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made the applet code compile under GTK.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2001-05-06 17:41:54 +00:00
parent 1661948432
commit db157a6cf8
10 changed files with 68 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/configure vendored
View File

@@ -821,6 +821,7 @@ trap 'rm -fr `echo "
src/canvas/Makefile src/canvas/Makefile
src/gizmos/Makefile src/gizmos/Makefile
src/plot/Makefile src/plot/Makefile
src/applet/Makefile
samples/Makefile samples/Makefile
samples/mmedia/Makefile samples/mmedia/Makefile
samples/ogl/Makefile samples/ogl/Makefile
@@ -835,6 +836,7 @@ trap 'rm -fr `echo "
samples/gizmos/splittree/Makefile samples/gizmos/splittree/Makefile
samples/xml/Makefile samples/xml/Makefile
samples/plot/Makefile samples/plot/Makefile
samples/applet/Makefile
utils/Makefile utils/Makefile
utils/wxrc/Makefile utils/wxrc/Makefile
utils/wxrcedit/Makefile utils/wxrcedit/Makefile
@@ -926,6 +928,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
src/canvas/Makefile src/canvas/Makefile
src/gizmos/Makefile src/gizmos/Makefile
src/plot/Makefile src/plot/Makefile
src/applet/Makefile
samples/Makefile samples/Makefile
samples/mmedia/Makefile samples/mmedia/Makefile
samples/ogl/Makefile samples/ogl/Makefile
@@ -940,6 +943,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
samples/gizmos/splittree/Makefile samples/gizmos/splittree/Makefile
samples/xml/Makefile samples/xml/Makefile
samples/plot/Makefile samples/plot/Makefile
samples/applet/Makefile
utils/Makefile utils/Makefile
utils/wxrc/Makefile utils/wxrc/Makefile
utils/wxrcedit/Makefile utils/wxrcedit/Makefile

2
contrib/configure.in
View File

@@ -46,6 +46,7 @@ AC_OUTPUT([
src/canvas/Makefile src/canvas/Makefile
src/gizmos/Makefile src/gizmos/Makefile
src/plot/Makefile src/plot/Makefile
src/applet/Makefile
samples/Makefile samples/Makefile
samples/mmedia/Makefile samples/mmedia/Makefile
samples/ogl/Makefile samples/ogl/Makefile
@@ -60,6 +61,7 @@ AC_OUTPUT([
samples/gizmos/splittree/Makefile samples/gizmos/splittree/Makefile
samples/xml/Makefile samples/xml/Makefile
samples/plot/Makefile samples/plot/Makefile
samples/applet/Makefile
utils/Makefile utils/Makefile
utils/wxrc/Makefile utils/wxrc/Makefile
utils/wxrcedit/Makefile utils/wxrcedit/Makefile

2
contrib/samples/Makefile.in
View File

@@ -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: all:
@for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE)); done @for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE)); done

25
contrib/samples/applet/Makefile.in Normal file
View File

@@ -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

2
contrib/samples/applet/applet.cpp
View File

@@ -32,6 +32,8 @@
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop
#endif #endif
#include "wx/wx.h"
#include "wx/applet/window.h" #include "wx/applet/window.h"
#include "applet.h" #include "applet.h"

2
contrib/samples/applet/combobox.cpp
View File

@@ -33,6 +33,8 @@
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop
#endif #endif
#include "wx/wx.h"
#include "combobox.h" #include "combobox.h"
/*------------------------- Implementation --------------------------------*/ /*------------------------- Implementation --------------------------------*/

5
contrib/samples/applet/index.html
View File

@@ -1,9 +1,10 @@
<html> <html>
<head><title>Widgets demo</title></head> <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>

9
contrib/samples/applet/monitorapplet.cpp
View File

@@ -34,6 +34,7 @@
#include "wx/wxprec.h" #include "wx/wxprec.h"
// Include private headers // Include private headers
#include "wx/wx.h"
#include "monitorapplet.h" #include "monitorapplet.h"
/*---------------------------- Global variables ---------------------------*/ /*---------------------------- Global variables ---------------------------*/
@@ -183,9 +184,9 @@ void MonitorApplet::ReadMfrList()
m_Mfr->Clear(); m_Mfr->Clear();
for (m = m_Monitors,i = 0; m->m_Mfr[0] != 0; m++) { 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; selected = i;
strcpy(buf,m->m_Mfr); strcpy(buf,m->m_Mfr);
i++; i++;
@@ -209,9 +210,9 @@ void MonitorApplet::ReadModelList(
mfrStr = m_Mfr->GetStringSelection(); mfrStr = m_Mfr->GetStringSelection();
m_Model->Clear(); m_Model->Clear();
for (m = m_Monitors,i = 0; m->m_Mfr[0] != 0; m++) { 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; selected = i;
i++; i++;
} }

2
contrib/src/Makefile.in
View File

@@ -1,6 +1,6 @@
# $Id$ # $Id$
CONTRIB_SUBDIRS=ogl mmedia stc xml CONTRIB_SUBDIRS=ogl mmedia stc xml applet
all: all:
@for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done

23
contrib/src/applet/Makefile.in Normal file
View File

@@ -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