git-svn-id: https://svn.code.sf.net/p/freetel/code@825 01035d8c-6547-0410-b346-abe4f9...

diff --git a/fdmdv2/tests/pa_enum/Makefile.linux.dmw b/fdmdv2/tests/pa_enum/Makefile.linux.dmw
index 14224cb2a8e8e1749ce801fa8431ca4563a86836..2d87336b7902a2580354a70e9e7a6f75dfa914e3 100644 (file)
--- 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 ed768b7b4cae21229165c9e53d4faa08f4308bbd..f84fd8598209f80b00eac9ea6760d712f48ef9cc 100644 (file)
--- a/fdmdv2/tests/pa_enum/main.cpp
+++ b/fdmdv2/tests/pa_enum/main.cpp
@@ -33,14 +33,15 @@ MainFrame::MainFrame(wxWindow *parent) : MainFrameBase(parent)
 {\r
     m_isPaInitialized = false;\r
     wxInitAllImageHandlers();\r
-    // Give it an icon\r
-    SetIcon(wxICON("../bitmaps/sample.ico"));\r
 \r
     // Make an image list containing large icons\r
     m_imageListNormal = new wxImageList(32, 32, true);\r
     m_imageListSmall = new wxImageList(16, 16, true);\r
 \r
 #ifdef __WXMSW__\r
+    // Give it an icon\r
+    SetIcon(wxICON("bitmaps/sample.ico"));\r
+\r
     m_imageListSmall->Add(wxIcon(wxT("bitmaps/toolchec.ico"), wxBITMAP_TYPE_ICO));\r
     m_imageListSmall->Add(wxIcon(wxT("bitmaps/transparent.ico"), wxBITMAP_TYPE_ICO));\r
     m_imageListSmall->Add(wxIcon(wxT("bitmaps/toolchar.ico"), wxBITMAP_TYPE_ICO));\r
@@ -51,6 +52,19 @@ MainFrame::MainFrame(wxWindow *parent) : MainFrameBase(parent)
     m_imageListSmall->Add(wxIcon(wxT("bitmaps/inArrow16x16.ico"), wxBITMAP_TYPE_ICO));\r
     m_imageListSmall->Add(wxIcon(wxT("bitmaps/outArrow16x16.ico"), wxBITMAP_TYPE_ICO));\r
 #else\r
+    // Give it an icon\r
+    SetIcon(wxICON("bitmaps/sample.xpm"));\r
+\r
+    m_imageListSmall->Add(wxIcon(wxT("bitmaps/toolchec.xpm"), wxBITMAP_TYPE_XPM));\r
+    m_imageListSmall->Add(wxIcon(wxT("bitmaps/transparent.xpm"), wxBITMAP_TYPE_XPM));\r
+    m_imageListSmall->Add(wxIcon(wxT("bitmaps/toolchar.xpm"), wxBITMAP_TYPE_XPM));\r
+    m_imageListSmall->Add(wxIcon(wxT("bitmaps/tooldata.xpm"), wxBITMAP_TYPE_XPM));\r
+    m_imageListSmall->Add(wxIcon(wxT("bitmaps/toolgame.xpm"), wxBITMAP_TYPE_XPM));\r
+    m_imageListSmall->Add(wxIcon(wxT("bitmaps/toolnote.xpm"), wxBITMAP_TYPE_XPM));\r
+    m_imageListSmall->Add(wxIcon(wxT("bitmaps/tooltime.xpm"), wxBITMAP_TYPE_XPM));\r
+//    m_imageListSmall->Add(wxIcon(wxT("bitmaps/inArrow16x16.xpm"), wxBITMAP_TYPE_XPM));\r
+//    m_imageListSmall->Add(wxIcon(wxT("bitmaps/outArrow16x16.xpm"), wxBITMAP_TYPE_XPM));\r
+/*\r
     m_imageListNormal->Add(wxIcon( toolbrai_xpm ));\r
     m_imageListNormal->Add(wxIcon( toolchar_xpm ));\r
     m_imageListNormal->Add(wxIcon( tooldata_xpm ));\r
@@ -61,6 +75,7 @@ MainFrame::MainFrame(wxWindow *parent) : MainFrameBase(parent)
     m_imageListNormal->Add(wxIcon( tooltime_xpm ));\r
     m_imageListNormal->Add(wxIcon( toolword_xpm ));\r
     m_imageListSmall->Add(wxIcon(small1_xpm));\r
+*/\r
 #endif\r
     if(!m_isPaInitialized)\r
     {\r

diff --git a/fdmdv2/tests/pa_enum/main.h b/fdmdv2/tests/pa_enum/main.h
index cec65951e88313bf9c7b3caae61488207f8b83ec..6820e9c32fae2d683ba74486d7194c2b9c5eb311 100644 (file)
--- 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>\r
+/*\r
 #if !defined(__WXMSW__) && !defined(__WXPM__)
     #include "../bitmaps/sample.xpm"
 #endif
@@ -32,6 +33,7 @@
     #include "bitmaps/toolword.xpm"
     #include "bitmaps/small1.xpm"
 #endif
+*/\r
 \r
 #define AUDIO_IN      0\r
 #define AUDIO_OUT     1\r

diff --git a/fdmdv2/tests/pa_enum/pa_enum.mk b/fdmdv2/tests/pa_enum/pa_enum.mk
index 8acfd0bc23f0e1a322af391b991b439f1c4547a2..ef78705b180e0264aacdce66a1ebfb625edbf433 100644 (file)
--- 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\r
 CXX      := g++\r
 CC       := gcc\r
-CXXFLAGS :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"812\"  $(Preprocessors)\r
-CFLAGS   :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"812\"  $(Preprocessors)\r
+CXXFLAGS :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"814\"  $(Preprocessors)\r
+CFLAGS   :=  -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes)  -DSVN_REVISION=\"814\"  $(Preprocessors)\r
 \r
 \r
 ##\r