diff options
author | s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b> | 2009-11-06 05:50:05 +0000 |
---|---|---|
committer | s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b> | 2009-11-06 05:50:05 +0000 |
commit | 300d4608f2504e3e4a02a13b6c6000b52c436975 (patch) | |
tree | 87a748950637c99cca980d634ae499085777e2f0 /uiproject.fbp | |
parent | e4c05d31778a85014b2a52e2f20753b38dfbf950 (diff) |
got rid of CheckForShutdown, replaced some thread-unsafe wxWidgets calls, Linux fixes, socket send MSG_NOSIGNAL, bind INADDR_ANY, works reliably on Linux now except if wxMessageBox is used in a thread other than the GUI thread
git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@33 1a98c847-1fd6-4fd8-948a-caf3550aa51b
Diffstat (limited to 'uiproject.fbp')
-rw-r--r-- | uiproject.fbp | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/uiproject.fbp b/uiproject.fbp index 7bce7349f5..17656b56a5 100644 --- a/uiproject.fbp +++ b/uiproject.fbp @@ -70,7 +70,7 @@ <event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
- <object class="wxMenuBar" expanded="1">
+ <object class="wxMenuBar" expanded="0">
<property name="bg">240,240,240</property>
<property name="context_help"></property>
<property name="enabled">1</property>
@@ -225,7 +225,7 @@ </object>
</object>
</object>
- <object class="wxToolBar" expanded="1">
+ <object class="wxToolBar" expanded="0">
<property name="bg"></property>
<property name="bitmapsize">20,20</property>
<property name="context_help"></property>
@@ -439,7 +439,7 @@ <property name="name">m_textCtrlAddress</property>
<property name="permission">protected</property>
<property name="pos"></property>
- <property name="size">250,-1</property>
+ <property name="size">340,-1</property>
<property name="style">wxTE_READONLY</property>
<property name="subclass"></property>
<property name="tooltip"></property>
@@ -944,7 +944,7 @@ <property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
- <property name="window_style">wxALWAYS_SHOW_SB</property>
+ <property name="window_style">wxVSCROLL</property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
@@ -1648,7 +1648,7 @@ <property name="name">m_buttonOK</property>
<property name="permission">protected</property>
<property name="pos"></property>
- <property name="size">85,25</property>
+ <property name="size">-1,-1</property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
@@ -3031,7 +3031,7 @@ <property name="name">m_buttonOK</property>
<property name="permission">protected</property>
<property name="pos"></property>
- <property name="size">85,25</property>
+ <property name="size">-1,-1</property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
@@ -3079,7 +3079,7 @@ <property name="id">wxID_CANCEL</property>
<property name="label">Cancel</property>
<property name="maximum_size"></property>
- <property name="minimum_size">85,25</property>
+ <property name="minimum_size">-1,-1</property>
<property name="name">m_buttonCancel</property>
<property name="permission">protected</property>
<property name="pos"></property>
@@ -3131,7 +3131,7 @@ <property name="id">wxID_APPLY</property>
<property name="label">&Apply</property>
<property name="maximum_size"></property>
- <property name="minimum_size">85,25</property>
+ <property name="minimum_size">-1,-1</property>
<property name="name">m_buttonApply</property>
<property name="permission">protected</property>
<property name="pos"></property>
@@ -3493,7 +3493,7 @@ <property name="name">m_buttonOK</property>
<property name="permission">protected</property>
<property name="pos"></property>
- <property name="size">85,25</property>
+ <property name="size">-1,-1</property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
@@ -4485,7 +4485,7 @@ <property name="id">wxID_BUTTONSEND</property>
<property name="label">&Send</property>
<property name="maximum_size"></property>
- <property name="minimum_size">85,25</property>
+ <property name="minimum_size">-1,-1</property>
<property name="name">m_buttonSend</property>
<property name="permission">protected</property>
<property name="pos"></property>
@@ -4537,7 +4537,7 @@ <property name="id">wxID_CANCEL</property>
<property name="label">Cancel</property>
<property name="maximum_size"></property>
- <property name="minimum_size">85,25</property>
+ <property name="minimum_size">-1,-1</property>
<property name="name">m_buttonCancel</property>
<property name="permission">protected</property>
<property name="pos"></property>
@@ -4775,7 +4775,7 @@ <property name="id">wxID_ANY</property>
<property name="label">OK</property>
<property name="maximum_size"></property>
- <property name="minimum_size">85,25</property>
+ <property name="minimum_size">-1,-1</property>
<property name="name">m_buttonOK</property>
<property name="permission">protected</property>
<property name="pos"></property>
@@ -4827,7 +4827,7 @@ <property name="id">wxID_CANCEL</property>
<property name="label">Cancel</property>
<property name="maximum_size"></property>
- <property name="minimum_size">85,25</property>
+ <property name="minimum_size">-1,-1</property>
<property name="name">m_buttonCancel</property>
<property name="permission">protected</property>
<property name="pos"></property>
@@ -5089,7 +5089,7 @@ <property name="id">wxID_BUTTONRENAME</property>
<property name="label">&Edit...</property>
<property name="maximum_size"></property>
- <property name="minimum_size">85,25</property>
+ <property name="minimum_size">-1,-1</property>
<property name="name">m_buttonRename</property>
<property name="permission">protected</property>
<property name="pos"></property>
@@ -5141,7 +5141,7 @@ <property name="id">wxID_BUTTONNEW</property>
<property name="label">&New Address...</property>
<property name="maximum_size"></property>
- <property name="minimum_size">110,25</property>
+ <property name="minimum_size">-1,-1</property>
<property name="name">m_buttonNew</property>
<property name="permission">protected</property>
<property name="pos"></property>
@@ -5193,7 +5193,7 @@ <property name="id">wxID_BUTTONCOPY</property>
<property name="label">&Copy to Clipboard</property>
<property name="maximum_size"></property>
- <property name="minimum_size">120,25</property>
+ <property name="minimum_size">-1,-1</property>
<property name="name">m_buttonCopy</property>
<property name="permission">protected</property>
<property name="pos"></property>
@@ -5245,7 +5245,7 @@ <property name="id">wxID_OK</property>
<property name="label">OK</property>
<property name="maximum_size"></property>
- <property name="minimum_size">85,25</property>
+ <property name="minimum_size">-1,-1</property>
<property name="name">m_buttonOK</property>
<property name="permission">protected</property>
<property name="pos"></property>
@@ -5297,7 +5297,7 @@ <property name="id">wxID_CANCEL</property>
<property name="label">Cancel</property>
<property name="maximum_size"></property>
- <property name="minimum_size">85,25</property>
+ <property name="minimum_size">-1,-1</property>
<property name="name">m_buttonCancel</property>
<property name="permission">protected</property>
<property name="pos"></property>
@@ -5559,7 +5559,7 @@ <property name="id">wxID_BUTTONEDIT</property>
<property name="label">&Edit...</property>
<property name="maximum_size"></property>
- <property name="minimum_size">85,25</property>
+ <property name="minimum_size">-1,-1</property>
<property name="name">m_buttonEdit</property>
<property name="permission">protected</property>
<property name="pos"></property>
@@ -5611,7 +5611,7 @@ <property name="id">wxID_BUTTONNEW</property>
<property name="label">&New Address...</property>
<property name="maximum_size"></property>
- <property name="minimum_size">110,25</property>
+ <property name="minimum_size">-1,-1</property>
<property name="name">m_buttonNew</property>
<property name="permission">protected</property>
<property name="pos"></property>
@@ -5663,7 +5663,7 @@ <property name="id">wxID_BUTTONDELETE</property>
<property name="label">&Delete</property>
<property name="maximum_size"></property>
- <property name="minimum_size">85,25</property>
+ <property name="minimum_size">-1,-1</property>
<property name="name">m_buttonDelete</property>
<property name="permission">protected</property>
<property name="pos"></property>
@@ -5715,7 +5715,7 @@ <property name="id">wxID_OK</property>
<property name="label">OK</property>
<property name="maximum_size"></property>
- <property name="minimum_size">85,25</property>
+ <property name="minimum_size">-1,-1</property>
<property name="name">m_buttonOK</property>
<property name="permission">protected</property>
<property name="pos"></property>
@@ -5767,7 +5767,7 @@ <property name="id">wxID_CANCEL</property>
<property name="label">Cancel</property>
<property name="maximum_size"></property>
- <property name="minimum_size">85,25</property>
+ <property name="minimum_size">-1,-1</property>
<property name="name">m_buttonCancel</property>
<property name="permission">public</property>
<property name="pos"></property>
@@ -10225,7 +10225,7 @@ <property name="id">wxID_BUTTONSEND</property>
<property name="label">&Send</property>
<property name="maximum_size"></property>
- <property name="minimum_size">85,25</property>
+ <property name="minimum_size">-1,-1</property>
<property name="name">m_buttonOK</property>
<property name="permission">protected</property>
<property name="pos"></property>
@@ -10277,7 +10277,7 @@ <property name="id">wxID_BUTTONPREVIEW</property>
<property name="label">&Preview</property>
<property name="maximum_size"></property>
- <property name="minimum_size">85,25</property>
+ <property name="minimum_size">-1,-1</property>
<property name="name">m_buttonPreview</property>
<property name="permission">protected</property>
<property name="pos"></property>
@@ -10329,7 +10329,7 @@ <property name="id">wxID_CANCEL</property>
<property name="label">Cancel</property>
<property name="maximum_size"></property>
- <property name="minimum_size">85,25</property>
+ <property name="minimum_size">-1,-1</property>
<property name="name">m_buttonCancel</property>
<property name="permission">protected</property>
<property name="pos"></property>
@@ -10798,7 +10798,7 @@ <property name="id">wxID_BUTTONBACK</property>
<property name="label">< &Back </property>
<property name="maximum_size"></property>
- <property name="minimum_size">85,25</property>
+ <property name="minimum_size">-1,-1</property>
<property name="name">m_buttonBack</property>
<property name="permission">protected</property>
<property name="pos"></property>
@@ -10850,7 +10850,7 @@ <property name="id">wxID_BUTTONNEXT</property>
<property name="label"> &Next ></property>
<property name="maximum_size"></property>
- <property name="minimum_size">85,25</property>
+ <property name="minimum_size">-1,-1</property>
<property name="name">m_buttonNext</property>
<property name="permission">protected</property>
<property name="pos"></property>
@@ -10902,7 +10902,7 @@ <property name="id">wxID_CANCEL</property>
<property name="label">Cancel</property>
<property name="maximum_size"></property>
- <property name="minimum_size">85,25</property>
+ <property name="minimum_size">-1,-1</property>
<property name="name">m_buttonCancel</property>
<property name="permission">protected</property>
<property name="pos"></property>
@@ -11087,7 +11087,7 @@ <property name="id">wxID_OK</property>
<property name="label">OK</property>
<property name="maximum_size"></property>
- <property name="minimum_size">85,25</property>
+ <property name="minimum_size">-1,-1</property>
<property name="name">m_buttonOK</property>
<property name="permission">protected</property>
<property name="pos"></property>
@@ -11488,7 +11488,7 @@ <property name="id">wxID_SUBMIT</property>
<property name="label">&Submit</property>
<property name="maximum_size"></property>
- <property name="minimum_size">85,25</property>
+ <property name="minimum_size">-1,-1</property>
<property name="name">m_buttonSubmit</property>
<property name="permission">protected</property>
<property name="pos"></property>
@@ -11540,7 +11540,7 @@ <property name="id">wxID_CANCEL</property>
<property name="label">Cancel</property>
<property name="maximum_size"></property>
- <property name="minimum_size">85,25</property>
+ <property name="minimum_size">-1,-1</property>
<property name="name">m_buttonCancel</property>
<property name="permission">protected</property>
<property name="pos"></property>
@@ -12907,7 +12907,7 @@ <property name="id">wxID_OK</property>
<property name="label">OK</property>
<property name="maximum_size"></property>
- <property name="minimum_size">85,25</property>
+ <property name="minimum_size">-1,-1</property>
<property name="name">m_buttonOK</property>
<property name="permission">protected</property>
<property name="pos"></property>
@@ -12959,7 +12959,7 @@ <property name="id">wxID_CANCEL</property>
<property name="label">Cancel</property>
<property name="maximum_size"></property>
- <property name="minimum_size">85,25</property>
+ <property name="minimum_size">-1,-1</property>
<property name="name">m_buttonCancel</property>
<property name="permission">protected</property>
<property name="pos"></property>
|