Made the applet code compile under GTK.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
25
contrib/samples/applet/Makefile.in
Normal file
25
contrib/samples/applet/Makefile.in
Normal 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
|
@@ -32,6 +32,8 @@
|
||||
#ifdef __BORLANDC__
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
#include "wx/wx.h"
|
||||
#include "wx/applet/window.h"
|
||||
#include "applet.h"
|
||||
|
||||
|
@@ -33,6 +33,8 @@
|
||||
#ifdef __BORLANDC__
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
#include "wx/wx.h"
|
||||
#include "combobox.h"
|
||||
|
||||
/*------------------------- Implementation --------------------------------*/
|
||||
|
@@ -1,9 +1,10 @@
|
||||
<html>
|
||||
<head><title>Widgets demo</title></head>
|
||||
<body>
|
||||
<body text="#000000" bgcolor="#D0D0D0">
|
||||
|
||||
<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>
|
||||
|
||||
|
@@ -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++;
|
||||
}
|
||||
|
Reference in New Issue
Block a user