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

diff --git a/fdmdv2/FDMDV2.fbp b/fdmdv2/FDMDV2.fbp
index e7080eb02a355a0f160084ebb78b8d0ca00bbb75..87141674b5db68653c2de13cf234a8121c1d675f 100644 (file)
--- a/fdmdv2/FDMDV2.fbp
+++ b/fdmdv2/FDMDV2.fbp
@@ -24,7 +24,7 @@
         <property name="skip_python_events">1</property>\r
         <property name="use_enum">0</property>\r
         <property name="use_microsoft_bom">1</property>\r
-        <object class="Frame" expanded="1">\r
+        <object class="Frame" expanded="0">\r
             <property name="BottomDockable">1</property>\r
             <property name="LeftDockable">1</property>\r
             <property name="RightDockable">1</property>\r
@@ -120,7 +120,7 @@
             <event name="OnSetFocus"></event>\r
             <event name="OnSize">topFrame_OnSize</event>\r
             <event name="OnUpdateUI">topFrame_OnUpdateUI</event>\r
-            <object class="wxMenuBar" expanded="1">\r
+            <object class="wxMenuBar" expanded="0">\r
                 <property name="BottomDockable">1</property>\r
                 <property name="LeftDockable">1</property>\r
                 <property name="RightDockable">1</property>\r
@@ -319,7 +319,7 @@
                         <event name="OnUpdateUI">OnPasteUpdateUI</event>\r
                     </object>\r
                 </object>\r
-                <object class="wxMenu" expanded="1">\r
+                <object class="wxMenu" expanded="0">\r
                     <property name="label">&amp;Tools</property>\r
                     <property name="name">tools</property>\r
                     <property name="permission">protected</property>\r
@@ -368,7 +368,7 @@
                         <event name="OnMenuSelection">OnToolsOptions</event>\r
                         <event name="OnUpdateUI">OnToolsOptionsUI</event>\r
                     </object>\r
-                    <object class="separator" expanded="1">\r
+                    <object class="separator" expanded="0">\r
                         <property name="name">m_separator2</property>\r
                         <property name="permission">none</property>\r
                     </object>\r
@@ -402,11 +402,11 @@
                         <event name="OnMenuSelection">OnCaptureTxStream</event>\r
                         <event name="OnUpdateUI"></event>\r
                     </object>\r
-                    <object class="separator" expanded="1">\r
+                    <object class="separator" expanded="0">\r
                         <property name="name">m_separator3</property>\r
                         <property name="permission">none</property>\r
                     </object>\r
-                    <object class="wxMenuItem" expanded="1">\r
+                    <object class="wxMenuItem" expanded="0">\r
                         <property name="bitmap"></property>\r
                         <property name="checked">0</property>\r
                         <property name="enabled">1</property>\r
@@ -458,12 +458,12 @@
                     </object>\r
                 </object>\r
             </object>\r
-            <object class="wxBoxSizer" expanded="1">\r
+            <object class="wxBoxSizer" expanded="0">\r
                 <property name="minimum_size"></property>\r
                 <property name="name">bSizer1</property>\r
                 <property name="orient">wxHORIZONTAL</property>\r
                 <property name="permission">none</property>\r
-                <object class="sizeritem" expanded="1">\r
+                <object class="sizeritem" expanded="0">\r
                     <property name="border">5</property>\r
                     <property name="flag">wxALL|wxEXPAND</property>\r
                     <property name="proportion">0</property>\r
@@ -778,20 +778,20 @@
                         </object>\r
                     </object>\r
                 </object>\r
-                <object class="sizeritem" expanded="1">\r
+                <object class="sizeritem" expanded="0">\r
                     <property name="border">1</property>\r
                     <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND</property>\r
                     <property name="proportion">4</property>\r
-                    <object class="wxBoxSizer" expanded="1">\r
+                    <object class="wxBoxSizer" expanded="0">\r
                         <property name="minimum_size"></property>\r
                         <property name="name">centerSizer</property>\r
                         <property name="orient">wxVERTICAL</property>\r
                         <property name="permission">none</property>\r
-                        <object class="sizeritem" expanded="1">\r
+                        <object class="sizeritem" expanded="0">\r
                             <property name="border">0</property>\r
                             <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALIGN_TOP|wxEXPAND</property>\r
                             <property name="proportion">1</property>\r
-                            <object class="wxBoxSizer" expanded="1">\r
+                            <object class="wxBoxSizer" expanded="0">\r
                                 <property name="minimum_size"></property>\r
                                 <property name="name">upperSizer</property>\r
                                 <property name="orient">wxVERTICAL</property>\r
@@ -1193,11 +1193,11 @@
                         </object>\r
                     </object>\r
                 </object>\r
-                <object class="sizeritem" expanded="1">\r
+                <object class="sizeritem" expanded="0">\r
                     <property name="border">3</property>\r
                     <property name="flag">wxALL|wxEXPAND</property>\r
                     <property name="proportion">0</property>\r
-                    <object class="wxBoxSizer" expanded="1">\r
+                    <object class="wxBoxSizer" expanded="0">\r
                         <property name="minimum_size"></property>\r
                         <property name="name">rightSizer</property>\r
                         <property name="orient">wxVERTICAL</property>\r
@@ -1423,11 +1423,11 @@
                                 </object>\r
                             </object>\r
                         </object>\r
-                        <object class="sizeritem" expanded="1">\r
+                        <object class="sizeritem" expanded="0">\r
                             <property name="border">3</property>\r
                             <property name="flag">wxALIGN_CENTER|wxALL|wxEXPAND</property>\r
                             <property name="proportion">2</property>\r
-                            <object class="wxStaticBoxSizer" expanded="1">\r
+                            <object class="wxStaticBoxSizer" expanded="0">\r
                                 <property name="id">wxID_ANY</property>\r
                                 <property name="label">Control</property>\r
                                 <property name="minimum_size"></property>\r
@@ -1435,20 +1435,20 @@
                                 <property name="orient">wxVERTICAL</property>\r
                                 <property name="permission">none</property>\r
                                 <event name="OnUpdateUI"></event>\r
-                                <object class="sizeritem" expanded="1">\r
+                                <object class="sizeritem" expanded="0">\r
                                     <property name="border">1</property>\r
                                     <property name="flag">wxEXPAND</property>\r
                                     <property name="proportion">0</property>\r
-                                    <object class="wxBoxSizer" expanded="1">\r
+                                    <object class="wxBoxSizer" expanded="0">\r
                                         <property name="minimum_size"></property>\r
                                         <property name="name">bSizer1511</property>\r
                                         <property name="orient">wxVERTICAL</property>\r
                                         <property name="permission">none</property>\r
-                                        <object class="sizeritem" expanded="1">\r
+                                        <object class="sizeritem" expanded="0">\r
                                             <property name="border">1</property>\r
                                             <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL</property>\r
                                             <property name="proportion">0</property>\r
-                                            <object class="wxToggleButton" expanded="1">\r
+                                            <object class="wxToggleButton" expanded="0">\r
                                                 <property name="BottomDockable">1</property>\r
                                                 <property name="LeftDockable">1</property>\r
                                                 <property name="RightDockable">1</property>\r
@@ -1533,11 +1533,11 @@
                                         </object>\r
                                     </object>\r
                                 </object>\r
-                                <object class="sizeritem" expanded="1">\r
+                                <object class="sizeritem" expanded="0">\r
                                     <property name="border">1</property>\r
                                     <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND</property>\r
                                     <property name="proportion">0</property>\r
-                                    <object class="wxBoxSizer" expanded="1">\r
+                                    <object class="wxBoxSizer" expanded="0">\r
                                         <property name="minimum_size"></property>\r
                                         <property name="name">bSizer151</property>\r
                                         <property name="orient">wxVERTICAL</property>\r
@@ -1930,7 +1930,7 @@
                     </object>\r
                 </object>\r
             </object>\r
-            <object class="wxStatusBar" expanded="1">\r
+            <object class="wxStatusBar" expanded="0">\r
                 <property name="BottomDockable">1</property>\r
                 <property name="LeftDockable">1</property>\r
                 <property name="RightDockable">1</property>\r

diff --git a/fdmdv2/fdmdv2.workspace b/fdmdv2/fdmdv2.workspace
index 15ff7af48c13dbabc603a90d93687959916603e4..7e9ff586f026f1fdcc184e20a859860114fdc9e3 100644 (file)
--- a/fdmdv2/fdmdv2.workspace
+++ b/fdmdv2/fdmdv2.workspace
@@ -2,12 +2,16 @@
 <CodeLite_Workspace Name="fdmdv2" Database="./fdmdv2.tags">
   <Project Name="test_portaudio" Path="libsndfile/Projects/w32-mingw/test_sndfile.project" Active="No"/>
   <Project Name="test_hamlib" Path="hamlib-3.0/test_hamlib/test_hamlib.project" Active="No"/>
-  <Project Name="fdmdv2" Path="fdmdv2.project" Active="Yes"/>
+  <Project Name="fdmdv2" Path="fdmdv2.project" Active="No"/>
   <Project Name="pa_test" Path="pa_test/pa_test.project" Active="No"/>
   <Project Name="pa_cppbinding_test" Path="pa_cppbinding_test/pa_cppbinding_test.project" Active="No"/>
   <Project Name="fdmdv2basic" Path="fdmdv2basic/fdmdv2basic.project" Active="No"/>
+  <Project Name="pa_enum" Path="pa_enum/pa_enum.project" Active="Yes"/>
+  <Environment>
+    <![CDATA[]]>
+  </Environment>
   <BuildMatrix>
-    <WorkspaceConfiguration Name="Debug" Selected="no">
+    <WorkspaceConfiguration Name="Debug" Selected="yes">
       <Project Name="test_sndfile" ConfigName="Debug"/>
       <Project Name="test_portaudio" ConfigName="Debug"/>
       <Project Name="test_codec2" ConfigName="Debug"/>
@@ -17,8 +21,9 @@
       <Project Name="pa_test" ConfigName="Debug"/>
       <Project Name="pa_cppbinding_test" ConfigName="Debug"/>
       <Project Name="fdmdv2basic" ConfigName="Debug"/>
+      <Project Name="pa_enum" ConfigName="Debug"/>
     </WorkspaceConfiguration>
-    <WorkspaceConfiguration Name="Release" Selected="yes">
+    <WorkspaceConfiguration Name="Release" Selected="no">
       <Project Name="test_sndfile" ConfigName="Release"/>
       <Project Name="test_portaudio" ConfigName="Release"/>
       <Project Name="test_codec2" ConfigName="Release"/>
@@ -28,6 +33,7 @@
       <Project Name="pa_test" ConfigName="Release"/>
       <Project Name="pa_cppbinding_test" ConfigName="Release"/>
       <Project Name="fdmdv2basic" ConfigName="Release"/>
+      <Project Name="pa_enum" ConfigName="Release"/>
     </WorkspaceConfiguration>
   </BuildMatrix>
 </CodeLite_Workspace>

diff --git a/fdmdv2/fdmdv2_wsp.mk b/fdmdv2/fdmdv2_wsp.mk
index 466a60aeef2dd8396b23570e9534601e8e8cc696..ccef48879d49da622b1b07dec2cdf3a2dbb447e6 100644 (file)
--- a/fdmdv2/fdmdv2_wsp.mk
+++ b/fdmdv2/fdmdv2_wsp.mk
@@ -1,8 +1,8 @@
 .PHONY: clean All
 
 All:
-       @echo ----------Building project:[ test_sndfile - Release ]----------
-       @cd "libsndfile\Projects\w32-mingw" && "mingw32-make.exe"  -j 2 -f "test_sndfile.mk"
+       @echo ----------Building project:[ pa_enum - Debug ]----------
+       @cd "pa_enum" && "mingw32-make.exe"  -j 2 -f "pa_enum.mk"
 clean:
-       @echo ----------Cleaning project:[ test_sndfile - Release ]----------
-       @cd "libsndfile\Projects\w32-mingw" && "mingw32-make.exe"  -j 2 -f "test_sndfile.mk" clean
+       @echo ----------Cleaning project:[ pa_enum - Debug ]----------
+       @cd "pa_enum" && "mingw32-make.exe"  -j 2 -f "pa_enum.mk" clean