From 4555fc31fca90ddf390406d46826b89aa0a7dfb0 Mon Sep 17 00:00:00 2001
From: wittend99 <wittend99@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Thu, 25 Oct 2012 22:05:20 +0000
Subject: [PATCH] git-svn-id: https://svn.code.sf.net/p/freetel/code@825
 01035d8c-6547-0410-b346-abe4f91aad63

---
 fdmdv2/tests/pa_enum/Makefile.linux.dmw |  1 -
 fdmdv2/tests/pa_enum/main.cpp           | 19 +++++++++++++++++--
 fdmdv2/tests/pa_enum/main.h             |  2 ++
 fdmdv2/tests/pa_enum/pa_enum.mk         |  4 ++--
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/fdmdv2/tests/pa_enum/Makefile.linux.dmw b/fdmdv2/tests/pa_enum/Makefile.linux.dmw
index 14224cb2..2d87336b 100644
--- a/fdmdv2/tests/pa_enum/Makefile.linux.dmw
+++ b/fdmdv2/tests/pa_enum/Makefile.linux.dmw
@@ -4,7 +4,6 @@
 # $ make -f Makefile.linux.dmw
 
 WX_GTK_PATH=/home/wittend/Projects/wxWidgets-2.9.4/build_gtk
-#CODEC2_PATH=/home/wittend/codec2-dev
 
 WX_CONFIG=$(WX_GTK_PATH)/wx-config
 WX_CPPFLAGS = $(shell $(WX_CONFIG) --cxxflags)
diff --git a/fdmdv2/tests/pa_enum/main.cpp b/fdmdv2/tests/pa_enum/main.cpp
index ed768b7b..f84fd859 100644
--- a/fdmdv2/tests/pa_enum/main.cpp
+++ b/fdmdv2/tests/pa_enum/main.cpp
@@ -33,14 +33,15 @@ MainFrame::MainFrame(wxWindow *parent) : MainFrameBase(parent)
 {
     m_isPaInitialized = false;
     wxInitAllImageHandlers();
-    // Give it an icon
-    SetIcon(wxICON("../bitmaps/sample.ico"));
 
     // Make an image list containing large icons
     m_imageListNormal = new wxImageList(32, 32, true);
     m_imageListSmall = new wxImageList(16, 16, true);
 
 #ifdef __WXMSW__
+    // Give it an icon
+    SetIcon(wxICON("bitmaps/sample.ico"));
+
     m_imageListSmall->Add(wxIcon(wxT("bitmaps/toolchec.ico"), wxBITMAP_TYPE_ICO));
     m_imageListSmall->Add(wxIcon(wxT("bitmaps/transparent.ico"), wxBITMAP_TYPE_ICO));
     m_imageListSmall->Add(wxIcon(wxT("bitmaps/toolchar.ico"), wxBITMAP_TYPE_ICO));
@@ -51,6 +52,19 @@ MainFrame::MainFrame(wxWindow *parent) : MainFrameBase(parent)
     m_imageListSmall->Add(wxIcon(wxT("bitmaps/inArrow16x16.ico"), wxBITMAP_TYPE_ICO));
     m_imageListSmall->Add(wxIcon(wxT("bitmaps/outArrow16x16.ico"), wxBITMAP_TYPE_ICO));
 #else
+    // Give it an icon
+    SetIcon(wxICON("bitmaps/sample.xpm"));
+
+    m_imageListSmall->Add(wxIcon(wxT("bitmaps/toolchec.xpm"), wxBITMAP_TYPE_XPM));
+    m_imageListSmall->Add(wxIcon(wxT("bitmaps/transparent.xpm"), wxBITMAP_TYPE_XPM));
+    m_imageListSmall->Add(wxIcon(wxT("bitmaps/toolchar.xpm"), wxBITMAP_TYPE_XPM));
+    m_imageListSmall->Add(wxIcon(wxT("bitmaps/tooldata.xpm"), wxBITMAP_TYPE_XPM));
+    m_imageListSmall->Add(wxIcon(wxT("bitmaps/toolgame.xpm"), wxBITMAP_TYPE_XPM));
+    m_imageListSmall->Add(wxIcon(wxT("bitmaps/toolnote.xpm"), wxBITMAP_TYPE_XPM));
+    m_imageListSmall->Add(wxIcon(wxT("bitmaps/tooltime.xpm"), wxBITMAP_TYPE_XPM));
+//    m_imageListSmall->Add(wxIcon(wxT("bitmaps/inArrow16x16.xpm"), wxBITMAP_TYPE_XPM));
+//    m_imageListSmall->Add(wxIcon(wxT("bitmaps/outArrow16x16.xpm"), wxBITMAP_TYPE_XPM));
+/*
     m_imageListNormal->Add(wxIcon( toolbrai_xpm ));
     m_imageListNormal->Add(wxIcon( toolchar_xpm ));
     m_imageListNormal->Add(wxIcon( tooldata_xpm ));
@@ -61,6 +75,7 @@ MainFrame::MainFrame(wxWindow *parent) : MainFrameBase(parent)
     m_imageListNormal->Add(wxIcon( tooltime_xpm ));
     m_imageListNormal->Add(wxIcon( toolword_xpm ));
     m_imageListSmall->Add(wxIcon(small1_xpm));
+*/
 #endif
     if(!m_isPaInitialized)
     {
diff --git a/fdmdv2/tests/pa_enum/main.h b/fdmdv2/tests/pa_enum/main.h
index cec65951..6820e9c3 100644
--- a/fdmdv2/tests/pa_enum/main.h
+++ b/fdmdv2/tests/pa_enum/main.h
@@ -16,6 +16,7 @@
 // main wxWidgets header file
 #include <wx/wx.h>
 #include <wx/textctrl.h>
+/*
 #if !defined(__WXMSW__) && !defined(__WXPM__)
     #include "../bitmaps/sample.xpm"
 #endif
@@ -32,6 +33,7 @@
     #include "bitmaps/toolword.xpm"
     #include "bitmaps/small1.xpm"
 #endif
+*/
 
 #define AUDIO_IN      0
 #define AUDIO_OUT     1
diff --git a/fdmdv2/tests/pa_enum/pa_enum.mk b/fdmdv2/tests/pa_enum/pa_enum.mk
index 8acfd0bc..ef78705b 100644
--- a/fdmdv2/tests/pa_enum/pa_enum.mk
+++ b/fdmdv2/tests/pa_enum/pa_enum.mk
@@ -50,8 +50,8 @@ LibPath                := $(LibraryPathSwitch). $(LibraryPathSwitch)/bin/MinGW-4
 AR       := ar rcus
 CXX      := g++
 CC       := gcc
-CXXFLAGS :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"812\"  $(Preprocessors)
-CFLAGS   :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"812\"  $(Preprocessors)
+CXXFLAGS :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"814\"  $(Preprocessors)
+CFLAGS   :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"814\"  $(Preprocessors)
 
 
 ##
-- 
2.25.1