change 'properties' icon on basic main window toolbars

obs/forms/OBSWindows.cpp

@@ -9,8 +9,8 @@
 
 #include "res/delete.ico.h"
 #include "res/down.ico.h"
-#include "res/htmledit_icon22_properties.gif.h"
 #include "res/list_add.png.h"
+#include "res/properties.ico.h"
 #include "res/up.ico.h"
 
 ///////////////////////////////////////////////////////////////////////////
@@ -103,7 +103,7 @@ OBSBasicBase::OBSBasicBase( wxWindow* parent, wxWindowID id, const wxString& tit
 	
 	scenesToolbar->AddTool( ID_SCENE_DELETE, _("tool"), delete_ico_to_wx_bitmap(), wxNullBitmap, wxITEM_NORMAL, wxEmptyString, wxEmptyString, NULL ); 
 	
-	scenesToolbar->AddTool( ID_SCENE_PROPERTIES, _("tool"), htmledit_icon22_properties_gif_to_wx_bitmap(), wxNullBitmap, wxITEM_NORMAL, wxEmptyString, wxEmptyString, NULL ); 
+	scenesToolbar->AddTool( ID_SCENE_PROPERTIES, _("tool"), properties_ico_to_wx_bitmap(), wxNullBitmap, wxITEM_NORMAL, wxEmptyString, wxEmptyString, NULL ); 
 	
 	scenesToolbar->AddSeparator(); 
 	
@@ -146,7 +146,7 @@ OBSBasicBase::OBSBasicBase( wxWindow* parent, wxWindowID id, const wxString& tit
 	
 	sourcesToolbar->AddTool( ID_SOURCE_DELETE, _("tool"), delete_ico_to_wx_bitmap(), wxNullBitmap, wxITEM_NORMAL, wxEmptyString, wxEmptyString, NULL ); 
 	
-	sourcesToolbar->AddTool( ID_SOURCE_PROPERTIES, _("tool"), htmledit_icon22_properties_gif_to_wx_bitmap(), wxNullBitmap, wxITEM_NORMAL, wxEmptyString, wxEmptyString, NULL ); 
+	sourcesToolbar->AddTool( ID_SOURCE_PROPERTIES, _("tool"), properties_ico_to_wx_bitmap(), wxNullBitmap, wxITEM_NORMAL, wxEmptyString, wxEmptyString, NULL ); 
 	
 	sourcesToolbar->AddSeparator(); 
 	
@@ -174,15 +174,16 @@ OBSBasicBase::OBSBasicBase( wxWindow* parent, wxWindowID id, const wxString& tit
 	sourcesLabel1->Wrap( -1 );
 	bSizer42->Add( sourcesLabel1, 0, wxALL, 2 );
 	
-	m_panel16 = new wxPanel( mainPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER );
-	wxBoxSizer* bSizer43;
-	bSizer43 = new wxBoxSizer( wxVERTICAL );
+	m_scrolledWindow1 = new wxScrolledWindow( mainPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxSIMPLE_BORDER|wxVSCROLL );
+	m_scrolledWindow1->SetScrollRate( 5, 5 );
+	wxBoxSizer* bSizer44;
+	bSizer44 = new wxBoxSizer( wxVERTICAL );
 	
 	
-	m_panel16->SetSizer( bSizer43 );
-	m_panel16->Layout();
-	bSizer43->Fit( m_panel16 );
-	bSizer42->Add( m_panel16, 1, wxEXPAND | wxALL, 2 );
+	m_scrolledWindow1->SetSizer( bSizer44 );
+	m_scrolledWindow1->Layout();
+	bSizer44->Fit( m_scrolledWindow1 );
+	bSizer42->Add( m_scrolledWindow1, 1, wxEXPAND | wxALL, 2 );
 	
 	
 	bottomCenterContainer->Add( bSizer42, 1, wxEXPAND, 5 );

obs/forms/OBSWindows.fbp

@@ -820,7 +820,7 @@
                                                                                     <event name="OnUpdateUI"></event>
                                                                                 </object>
                                                                                 <object class="tool" expanded="0">
-                                                                                    <property name="bitmap">Load From Embedded File; images\htmledit_icon22_properties.gif</property>
+                                                                                    <property name="bitmap">Load From Embedded File; images\properties.ico</property>
                                                                                     <property name="context_menu">0</property>
                                                                                     <property name="id">ID_SCENE_PROPERTIES</property>
                                                                                     <property name="kind">wxITEM_NORMAL</property>
@@ -1282,7 +1282,7 @@
                                                                                     <event name="OnUpdateUI"></event>
                                                                                 </object>
                                                                                 <object class="tool" expanded="0">
-                                                                                    <property name="bitmap">Load From Embedded File; images\htmledit_icon22_properties.gif</property>
+                                                                                    <property name="bitmap">Load From Embedded File; images\properties.ico</property>
                                                                                     <property name="context_menu">0</property>
                                                                                     <property name="id">ID_SOURCE_PROPERTIES</property>
                                                                                     <property name="kind">wxITEM_NORMAL</property>
@@ -1450,7 +1450,7 @@
                                                                 <property name="border">2</property>
                                                                 <property name="flag">wxEXPAND | wxALL</property>
                                                                 <property name="proportion">1</property>
-                                                                <object class="wxPanel" expanded="0">
+                                                                <object class="wxScrolledWindow" expanded="0">
                                                                     <property name="BottomDockable">1</property>
                                                                     <property name="LeftDockable">1</property>
                                                                     <property name="RightDockable">1</property>
@@ -1485,7 +1485,7 @@
                                                                     <property name="minimize_button">0</property>
                                                                     <property name="minimum_size"></property>
                                                                     <property name="moveable">1</property>
-                                                                    <property name="name">m_panel16</property>
+                                                                    <property name="name">m_scrolledWindow1</property>
                                                                     <property name="pane_border">1</property>
                                                                     <property name="pane_position"></property>
                                                                     <property name="pane_size"></property>
@@ -1493,6 +1493,8 @@
                                                                     <property name="pin_button">1</property>
                                                                     <property name="pos"></property>
                                                                     <property name="resize">Resizable</property>
+                                                                    <property name="scroll_rate_x">5</property>
+                                                                    <property name="scroll_rate_y">5</property>
                                                                     <property name="show">1</property>
                                                                     <property name="size"></property>
                                                                     <property name="subclass"></property>
@@ -1500,7 +1502,7 @@
                                                                     <property name="tooltip"></property>
                                                                     <property name="window_extra_style"></property>
                                                                     <property name="window_name"></property>
-                                                                    <property name="window_style">wxSIMPLE_BORDER</property>
+                                                                    <property name="window_style">wxHSCROLL|wxSIMPLE_BORDER|wxVSCROLL</property>
                                                                     <event name="OnChar"></event>
                                                                     <event name="OnEnterWindow"></event>
                                                                     <event name="OnEraseBackground"></event>
@@ -1526,7 +1528,7 @@
                                                                     <event name="OnUpdateUI"></event>
                                                                     <object class="wxBoxSizer" expanded="0">
                                                                         <property name="minimum_size"></property>
-                                                                        <property name="name">bSizer43</property>
+                                                                        <property name="name">bSizer44</property>
                                                                         <property name="orient">wxVERTICAL</property>
                                                                         <property name="permission">none</property>
                                                                     </object>

obs/forms/OBSWindows.h

@@ -30,6 +30,7 @@ class WindowSubclass;
 #include <wx/listbox.h>
 #include <wx/toolbar.h>
 #include <wx/checklst.h>
+#include <wx/scrolwin.h>
 #include <wx/button.h>
 #include <wx/statusbr.h>
 #include <wx/frame.h>
@@ -121,7 +122,7 @@ class OBSBasicBase : public WindowSubclass
 		wxCheckListBox* sources;
 		wxToolBar* sourcesToolbar;
 		wxStaticText* sourcesLabel1;
-		wxPanel* m_panel16;
+		wxScrolledWindow* m_scrolledWindow1;
 		wxStaticText* m_staticText6;
 		wxButton* toggleStreamButton;
 		wxButton* ToggleRecordButton;

obs/forms/res/htmledit_icon22_properties.gif.h

@@ -1,34 +0,0 @@
-#ifndef HTMLEDIT_ICON22_PROPERTIES_GIF_H
-#define HTMLEDIT_ICON22_PROPERTIES_GIF_H
-
-#include <wx/mstream.h>
-#include <wx/image.h>
-#include <wx/bitmap.h>
-
-static const unsigned char htmledit_icon22_properties_gif[] = 
-{
-	0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0x10, 0x00, 0x10, 0x00, 
-	0xA2, 0x04, 0x00, 0x00, 0x00, 0x80, 0xC0, 0xC0, 0xC0, 0xFF, 
-	0xFF, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0xF9, 0x04, 
-	0x01, 0x00, 0x00, 0x04, 0x00, 0x2C, 0x00, 0x00, 0x00, 0x00, 
-	0x10, 0x00, 0x10, 0x00, 0x40, 0x03, 0x43, 0x48, 0xBA, 0xDC, 
-	0x34, 0x22, 0x4A, 0x01, 0x29, 0x1B, 0x18, 0x87, 0xB1, 0x83, 
-	0xF7, 0x00, 0x00, 0x61, 0x54, 0x36, 0x3A, 0xD7, 0xF7, 0x0D, 
-	0xE1, 0xB8, 0x51, 0x5D, 0x46, 0xB4, 0x65, 0x99, 0x59, 0x8B, 
-	0xA9, 0xCB, 0x68, 0xAE, 0xCF, 0x80, 0x06, 0x87, 0xA3, 0x0A, 
-	0xD0, 0x60, 0xC3, 0x8E, 0x87, 0x25, 0xAA, 0x45, 0x86, 0xB8, 
-	0x59, 0x65, 0x32, 0x19, 0x5C, 0xA8, 0x54, 0x6B, 0x0E, 0x5B, 
-	0xED, 0x79, 0x17, 0x09, 0x00, 0x3B, 
-};
-
-wxBitmap& htmledit_icon22_properties_gif_to_wx_bitmap()
-{
-	static wxMemoryInputStream memIStream( htmledit_icon22_properties_gif, sizeof( htmledit_icon22_properties_gif ) );
-	static wxImage image( memIStream, wxBITMAP_TYPE_GIF );
-	static wxBitmap bmp( image );
-	return bmp;
-};
-
-
-#endif //HTMLEDIT_ICON22_PROPERTIES_GIF_H

obs/forms/res/properties.ico.h

@@ -0,0 +1,136 @@
+#ifndef PROPERTIES_ICO_H
+#define PROPERTIES_ICO_H
+
+#include <wx/mstream.h>
+#include <wx/image.h>
+#include <wx/bitmap.h>
+
+static const unsigned char properties_ico[] = 
+{
+	0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x10, 0x10, 0x00, 0x00, 
+	0x01, 0x00, 0x20, 0x00, 0x68, 0x04, 0x00, 0x00, 0x16, 0x00, 
+	0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 
+	0x20, 0x00, 0x00, 0x00, 0x01, 0x00, 0x20, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x40, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x97, 0x92, 0x8F, 0xFF, 0x97, 0x92, 0x8F, 0xFF, 
+	0x97, 0x92, 0x8F, 0xFF, 0x97, 0x92, 0x8F, 0xFF, 0x97, 0x92, 
+	0x8F, 0xFF, 0x97, 0x92, 0x8F, 0xFF, 0x97, 0x92, 0x8F, 0xFF, 
+	0x97, 0x92, 0x8F, 0xFF, 0x97, 0x92, 0x8F, 0xFF, 0x97, 0x92, 
+	0x8F, 0xFF, 0x97, 0x92, 0x8F, 0xFF, 0x97, 0x92, 0x8F, 0xFF, 
+	0x97, 0x92, 0x8F, 0xFF, 0x97, 0x92, 0x8F, 0xFF, 0x97, 0x92, 
+	0x8F, 0xFF, 0x97, 0x92, 0x8F, 0xFF, 0x97, 0x92, 0x8F, 0xFF, 
+	0xFE, 0xFD, 0xFE, 0xFF, 0xFD, 0xFC, 0xFD, 0xFF, 0xFB, 0xFB, 
+	0xFB, 0xFF, 0xFA, 0xFA, 0xF9, 0xFF, 0xF8, 0xF9, 0xF8, 0xFF, 
+	0xF7, 0xF7, 0xF7, 0xFF, 0xF5, 0xF6, 0xF6, 0xFF, 0xF5, 0xF4, 
+	0xF4, 0xFF, 0xF3, 0xF3, 0xF3, 0xFF, 0xF2, 0xF2, 0xF2, 0xFF, 
+	0xF1, 0xF1, 0xF1, 0xFF, 0xF0, 0xF0, 0xF0, 0xFF, 0xF0, 0xF0, 
+	0xF0, 0xFF, 0xF0, 0xF0, 0xF0, 0xFF, 0x97, 0x92, 0x8F, 0xFF, 
+	0x97, 0x92, 0x8F, 0xFF, 0xFE, 0xFE, 0xFE, 0xFF, 0xAB, 0x98, 
+	0x9A, 0xFF, 0xAB, 0x97, 0x9A, 0xFF, 0xAA, 0x97, 0x9A, 0xFF, 
+	0xAB, 0x98, 0x9A, 0xFF, 0xAB, 0x97, 0x9A, 0xFF, 0xAA, 0x97, 
+	0x9A, 0xFF, 0xAA, 0x97, 0x99, 0xFF, 0xAA, 0x96, 0x99, 0xFF, 
+	0xAB, 0x97, 0x9A, 0xFF, 0xAA, 0x97, 0x9A, 0xFF, 0xAA, 0x97, 
+	0x99, 0xFF, 0xAA, 0x96, 0x99, 0xFF, 0xF0, 0xF0, 0xF0, 0xFF, 
+	0x97, 0x92, 0x8F, 0xFF, 0x97, 0x92, 0x8F, 0xFF, 0xFF, 0xFE, 
+	0xFF, 0xFF, 0xFE, 0xFE, 0xFE, 0xFF, 0xF6, 0xF6, 0xF6, 0xFF, 
+	0xF6, 0xF6, 0xF6, 0xFF, 0xF6, 0xF6, 0xF6, 0xFF, 0xF5, 0xF5, 
+	0xF5, 0xFF, 0xF5, 0xF6, 0xF5, 0xFF, 0xF6, 0xF6, 0xF5, 0xFF, 
+	0xF5, 0xF4, 0xF4, 0xFF, 0xF3, 0xF3, 0xF4, 0xFF, 0xF2, 0xF2, 
+	0xF2, 0xFF, 0xF1, 0xF1, 0xF1, 0xFF, 0xF1, 0xF0, 0xF1, 0xFF, 
+	0xF0, 0xF0, 0xF0, 0xFF, 0x97, 0x92, 0x8F, 0xFF, 0x97, 0x92, 
+	0x8F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 
+	0xFB, 0xFB, 0xFB, 0xFF, 0xFB, 0xFA, 0xFB, 0xFF, 0xF9, 0xF8, 
+	0xF9, 0xFF, 0xF7, 0xF6, 0xF7, 0xFF, 0xF7, 0xF7, 0xF7, 0xFF, 
+	0xF8, 0xF7, 0xF8, 0xFF, 0xF6, 0xF7, 0xF6, 0xFF, 0xF5, 0xF5, 
+	0xF5, 0xFF, 0xF3, 0xF3, 0xF4, 0xFF, 0xF2, 0xF2, 0xF3, 0xFF, 
+	0xF2, 0xF1, 0xF1, 0xFF, 0xF0, 0xF0, 0xF0, 0xFF, 0x97, 0x92, 
+	0x8F, 0xFF, 0x97, 0x92, 0x8F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 
+	0xAB, 0x98, 0x9A, 0xFF, 0xAB, 0x97, 0x9A, 0xFF, 0xAA, 0x97, 
+	0x9A, 0xFF, 0xAB, 0x98, 0x9A, 0xFF, 0xAB, 0x97, 0x9A, 0xFF, 
+	0xAA, 0x97, 0x9A, 0xFF, 0xAA, 0x97, 0x99, 0xFF, 0xAA, 0x96, 
+	0x99, 0xFF, 0xAB, 0x97, 0x9A, 0xFF, 0xAA, 0x97, 0x9A, 0xFF, 
+	0xAA, 0x97, 0x99, 0xFF, 0xAA, 0x96, 0x99, 0xFF, 0xF0, 0xF0, 
+	0xF1, 0xFF, 0x97, 0x92, 0x8F, 0xFF, 0x97, 0x92, 0x8F, 0xFF, 
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xFD, 
+	0xFD, 0xFF, 0xFD, 0xFC, 0xFD, 0xFF, 0xFA, 0xFA, 0xFA, 0xFF, 
+	0xF7, 0xF7, 0xF7, 0xFF, 0xF6, 0xF5, 0xF6, 0xFF, 0xEB, 0xEB, 
+	0xEB, 0xFF, 0x7F, 0x85, 0xAA, 0xFF, 0xAB, 0xAA, 0xB6, 0xFF, 
+	0xF4, 0xF4, 0xF4, 0xFF, 0xF3, 0xF3, 0xF3, 0xFF, 0xF2, 0xF2, 
+	0xF2, 0xFF, 0xF1, 0xF1, 0xF1, 0xFF, 0x97, 0x92, 0x8F, 0xFF, 
+	0x97, 0x92, 0x8F, 0xFF, 0xD9, 0xD9, 0xE3, 0xFF, 0xDE, 0xDE, 
+	0xE1, 0xFF, 0xFE, 0xFE, 0xFE, 0xFF, 0xFE, 0xFE, 0xFE, 0xFF, 
+	0xFE, 0xFE, 0xFE, 0xFF, 0xFC, 0xFB, 0xFC, 0xFF, 0xB8, 0xBD, 
+	0xD8, 0xFF, 0x7C, 0x85, 0xB4, 0xFF, 0x85, 0x8F, 0xBD, 0xFF, 
+	0x90, 0x9B, 0xCE, 0xFF, 0x7F, 0x84, 0x98, 0xFF, 0xE5, 0xE4, 
+	0xE6, 0xFF, 0xF3, 0xF2, 0xF2, 0xFF, 0xF1, 0xF1, 0xF2, 0xFF, 
+	0x97, 0x92, 0x8F, 0xFF, 0x97, 0x92, 0x8F, 0xFF, 0xCB, 0xD7, 
+	0xFA, 0xFF, 0x90, 0x99, 0xD0, 0xFF, 0x73, 0x6A, 0x7A, 0xFF, 
+	0xA9, 0x96, 0x99, 0xFF, 0xAB, 0x98, 0x9A, 0xFF, 0x85, 0x7E, 
+	0x90, 0xFF, 0x65, 0x68, 0x84, 0xFF, 0xAF, 0xBC, 0xF5, 0xFF, 
+	0x75, 0x7E, 0xB7, 0xFF, 0x93, 0x9E, 0xCE, 0xFF, 0x7B, 0x7F, 
+	0xAD, 0xFF, 0x71, 0x75, 0x99, 0xFF, 0xA2, 0x8F, 0x93, 0xFF, 
+	0xF2, 0xF3, 0xF2, 0xFF, 0x97, 0x92, 0x8F, 0xFF, 0x97, 0x92, 
+	0x8F, 0xFF, 0xE8, 0xE9, 0xED, 0xFF, 0xD1, 0xDC, 0xFC, 0xFF, 
+	0xA8, 0xB5, 0xEC, 0xFF, 0x89, 0x8F, 0xBE, 0xFF, 0xD3, 0xD4, 
+	0xD7, 0xFF, 0xA4, 0xAC, 0xDB, 0xFF, 0x93, 0x9F, 0xDC, 0xFF, 
+	0x52, 0x5A, 0x80, 0xFF, 0xBC, 0xCB, 0xF7, 0xFF, 0x77, 0x81, 
+	0xBC, 0xFF, 0x7A, 0x82, 0xB2, 0xFF, 0x79, 0x83, 0xB6, 0xFF, 
+	0x91, 0x96, 0xB2, 0xFF, 0xF3, 0xF3, 0xF3, 0xFF, 0x97, 0x92, 
+	0x8F, 0xFF, 0x97, 0x92, 0x8F, 0xFF, 0xCD, 0xCC, 0xCA, 0xFF, 
+	0xC5, 0xC5, 0xC6, 0xFF, 0xCE, 0xD8, 0xEF, 0xFF, 0xBE, 0xCD, 
+	0xFB, 0xFF, 0x89, 0x92, 0xCB, 0xFF, 0x79, 0x81, 0xAC, 0xFF, 
+	0x76, 0x80, 0xA9, 0xFF, 0xA6, 0xB2, 0xED, 0xFF, 0x51, 0x5A, 
+	0x86, 0xFF, 0xB8, 0xC1, 0xEE, 0xFF, 0x74, 0x76, 0xAA, 0xFF, 
+	0x7A, 0x84, 0xBC, 0xFF, 0x86, 0x91, 0xC9, 0xFF, 0xA8, 0xAB, 
+	0xBE, 0xFF, 0x97, 0x92, 0x8F, 0xFF, 0x97, 0x92, 0x8F, 0xFF, 
+	0xE0, 0xD9, 0xD3, 0xFF, 0xE0, 0xD9, 0xD3, 0xFF, 0xDF, 0xD8, 
+	0xD3, 0xFF, 0xD4, 0xD8, 0xE8, 0xFF, 0xC7, 0xD5, 0xFA, 0xFF, 
+	0xAB, 0xB5, 0xEA, 0xFF, 0x73, 0x7B, 0xA5, 0xFF, 0x95, 0xA0, 
+	0xCE, 0xFF, 0xA5, 0xAF, 0xDF, 0xFF, 0x4A, 0x4F, 0x78, 0xFF, 
+	0x96, 0xA0, 0xDE, 0xFF, 0x8E, 0x9A, 0xD9, 0xFF, 0xA0, 0xAD, 
+	0xF2, 0xFF, 0xAB, 0xB7, 0xF6, 0xFF, 0x87, 0x86, 0x99, 0xFF, 
+	0x97, 0x92, 0x8F, 0xFF, 0x97, 0x92, 0x8F, 0xFF, 0x97, 0x92, 
+	0x8F, 0xFF, 0x97, 0x92, 0x8F, 0xFF, 0x97, 0x92, 0x8F, 0xFF, 
+	0x95, 0x94, 0x98, 0xFF, 0xA9, 0xB4, 0xE3, 0xFF, 0xA9, 0xB7, 
+	0xEB, 0xFF, 0x52, 0x56, 0x7E, 0xFF, 0x8E, 0x93, 0xC4, 0xFF, 
+	0x9A, 0xA6, 0xDD, 0xFF, 0xB3, 0xC1, 0xF9, 0xFF, 0xA6, 0xB4, 
+	0xF7, 0xFF, 0xAE, 0xBA, 0xFC, 0xFF, 0xBA, 0xC8, 0xFE, 0xFF, 
+	0xB2, 0xBC, 0xE3, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5B, 0x60, 
+	0x86, 0x1C, 0xB0, 0xBE, 0xFA, 0xE8, 0x92, 0x9D, 0xDB, 0xFF, 
+	0xA1, 0xAE, 0xF3, 0xFF, 0xBC, 0xCA, 0xFE, 0xFF, 0xC1, 0xD1, 
+	0xFE, 0xFF, 0xC0, 0xD0, 0xFE, 0xFF, 0xC9, 0xD9, 0xFE, 0xFF, 
+	0xC8, 0xD8, 0xFD, 0xFE, 0x8E, 0x99, 0xBD, 0x54, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0x8C, 0xB1, 0x3B, 
+	0xAB, 0xB9, 0xF5, 0xC9, 0xA4, 0xB1, 0xF5, 0xD5, 0xB0, 0xBD, 
+	0xFC, 0xD8, 0xB8, 0xC3, 0xFC, 0xF5, 0xBF, 0xCF, 0xFF, 0xFE, 
+	0xD5, 0xE5, 0xFE, 0xFF, 0xDA, 0xE7, 0xFD, 0xD2, 0x54, 0xAA, 
+	0xAA, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x65, 0x65, 0x87, 0x05, 
+	0x67, 0x6B, 0x8D, 0x34, 0xC7, 0xD3, 0xFE, 0xA8, 0xA1, 0xAC, 
+	0xC6, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0x00, 
+	0x00, 0x00, 0xFE, 0x00, 0x00, 0x00, 0xFF, 0xE1, 0x00, 0x00, 
+};
+
+wxBitmap& properties_ico_to_wx_bitmap()
+{
+	static wxMemoryInputStream memIStream( properties_ico, sizeof( properties_ico ) );
+	static wxImage image( memIStream, wxBITMAP_TYPE_ICO );
+	static wxBitmap bmp( image );
+	return bmp;
+};
+
+
+#endif //PROPERTIES_ICO_H