diff --git a/obs/OBSWindows.cpp b/obs/OBSWindows.cpp index 5cef47605..210924cfe 100644 --- a/obs/OBSWindows.cpp +++ b/obs/OBSWindows.cpp @@ -1,10 +1,12 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 8 2012) +// C++ code generated with wxFormBuilder (version Nov 6 2013) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// +#include "window-subclass.hpp" + #include "OBSWindows.h" #include "res/delete.ico.h" @@ -15,10 +17,9 @@ /////////////////////////////////////////////////////////////////////////// -OBSBasicBase::OBSBasicBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style ) +OBSBasicBase::OBSBasicBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : WindowSubclass( parent, id, title, pos, size, style ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - this->SetFont( wxFont( 8, 70, 90, 90, false, wxT("Tahoma") ) ); mainMenu = new wxMenuBar( 0 ); fileMenu = new wxMenu(); @@ -110,8 +111,6 @@ OBSBasicBase::OBSBasicBase( wxWindow* parent, wxWindowID id, const wxString& tit scenesToolbar->AddSeparator(); - scenesToolbar->AddSeparator(); - scenesToolbar->AddTool( ID_SCENE_MOVEUP, _("tool"), up_ico_to_wx_bitmap(), wxNullBitmap, wxITEM_NORMAL, wxEmptyString, wxEmptyString, NULL ); scenesToolbar->AddTool( ID_SCENE_MOVEDOWN, _("tool"), down_ico_to_wx_bitmap(), wxNullBitmap, wxITEM_NORMAL, wxEmptyString, wxEmptyString, NULL ); @@ -155,8 +154,6 @@ OBSBasicBase::OBSBasicBase( wxWindow* parent, wxWindowID id, const wxString& tit sourcesToolbar->AddSeparator(); - sourcesToolbar->AddSeparator(); - sourcesToolbar->AddTool( ID_SOURCE_MOVEUP, _("tool"), up_ico_to_wx_bitmap(), wxNullBitmap, wxITEM_NORMAL, wxEmptyString, wxEmptyString, NULL ); sourcesToolbar->AddTool( ID_SOURCE_MOVEDOWN, _("tool"), down_ico_to_wx_bitmap(), wxNullBitmap, wxITEM_NORMAL, wxEmptyString, wxEmptyString, NULL ); @@ -275,10 +272,9 @@ OBSBasicBase::~OBSBasicBase() } -OBSStudioBase::OBSStudioBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style ) +OBSStudioBase::OBSStudioBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : WindowSubclass( parent, id, title, pos, size, style ) { this->SetSizeHints( wxSize( 900,400 ), wxDefaultSize ); - this->SetFont( wxFont( 8, 70, 90, 90, false, wxT("Tahoma") ) ); wxBoxSizer* clientSIzer; clientSIzer = new wxBoxSizer( wxVERTICAL ); @@ -373,7 +369,7 @@ OBSStudioBase::OBSStudioBase( wxWindow* parent, wxWindowID id, const wxString& t wxBoxSizer* bSizer20; bSizer20 = new wxBoxSizer( wxHORIZONTAL ); - bSizer20->SetMinSize( wxSize( 900,170 ) ); + bSizer20->SetMinSize( wxSize( 900,155 ) ); wxBoxSizer* bSizer16; bSizer16 = new wxBoxSizer( wxVERTICAL ); @@ -397,8 +393,6 @@ OBSStudioBase::OBSStudioBase( wxWindow* parent, wxWindowID id, const wxString& t m_toolBar1->AddSeparator(); - m_toolBar1->AddSeparator(); - m_toolBar1->AddTool( wxID_ANY, _("tool"), up_ico_to_wx_bitmap(), wxNullBitmap, wxITEM_NORMAL, wxEmptyString, wxEmptyString, NULL ); m_toolBar1->AddTool( wxID_ANY, _("tool"), down_ico_to_wx_bitmap(), wxNullBitmap, wxITEM_NORMAL, wxEmptyString, wxEmptyString, NULL ); @@ -439,10 +433,6 @@ OBSStudioBase::OBSStudioBase( wxWindow* parent, wxWindowID id, const wxString& t m_toolBar11->AddTool( wxID_ANY, _("tool"), htmledit_icon22_properties_gif_to_wx_bitmap(), wxNullBitmap, wxITEM_NORMAL, wxEmptyString, wxEmptyString, NULL ); - m_toolBar11->AddSeparator(); - - m_toolBar11->AddSeparator(); - m_toolBar11->Realize(); bSizer37->Add( m_toolBar11, 0, wxEXPAND, 5 ); @@ -482,8 +472,6 @@ OBSStudioBase::OBSStudioBase( wxWindow* parent, wxWindowID id, const wxString& t m_toolBar12->AddSeparator(); - m_toolBar12->AddSeparator(); - m_toolBar12->AddTool( wxID_ANY, _("tool"), up_ico_to_wx_bitmap(), wxNullBitmap, wxITEM_NORMAL, wxEmptyString, wxEmptyString, NULL ); m_toolBar12->AddTool( wxID_ANY, _("tool"), down_ico_to_wx_bitmap(), wxNullBitmap, wxITEM_NORMAL, wxEmptyString, wxEmptyString, NULL ); @@ -508,14 +496,14 @@ OBSStudioBase::OBSStudioBase( wxWindow* parent, wxWindowID id, const wxString& t m_staticText4->Wrap( -1 ); bSizer19->Add( m_staticText4, 0, wxALL, 3 ); - m_panel15 = new wxPanel( mainPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER ); + m_panel15 = new wxPanel( mainPanel, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxSIMPLE_BORDER ); wxBoxSizer* bSizer40; bSizer40 = new wxBoxSizer( wxVERTICAL ); - m_listCtrl1 = new wxListCtrl( m_panel15, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxLC_SINGLE_SEL|wxNO_BORDER ); + m_listCtrl1 = new ListCtrlFixed( m_panel15, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxLC_SINGLE_SEL|wxNO_BORDER ); m_listCtrl1->SetMinSize( wxSize( 400,-1 ) ); - bSizer40->Add( m_listCtrl1, 1, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 0 ); + bSizer40->Add( m_listCtrl1, 1, 0, 0 ); m_toolBar13 = new wxToolBar( m_panel15, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL|wxNO_BORDER ); m_toolBar13->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); @@ -524,10 +512,6 @@ OBSStudioBase::OBSStudioBase( wxWindow* parent, wxWindowID id, const wxString& t m_toolBar13->AddTool( wxID_ANY, _("tool"), delete_ico_to_wx_bitmap(), wxNullBitmap, wxITEM_NORMAL, wxEmptyString, wxEmptyString, NULL ); - m_toolBar13->AddSeparator(); - - m_toolBar13->AddSeparator(); - m_toolBar13->Realize(); bSizer40->Add( m_toolBar13, 0, wxEXPAND, 5 ); diff --git a/obs/OBSWindows.fbp b/obs/OBSWindows.fbp index 80957c582..37eba4c57 100644 --- a/obs/OBSWindows.fbp +++ b/obs/OBSWindows.fbp @@ -20,8 +20,10 @@ . 1 + 1 1 1 + UI 0 0 @@ -35,16 +37,16 @@ impl_virtual - Tahoma,90,90,8,70,0 + 0 wxID_ANY OBSBasicBase - 854,614 + 923,677 wxDEFAULT_FRAME_STYLE - + WindowSubclass; window-subclass.hpp .mainwindow @@ -201,16 +203,16 @@ - + mainContainer wxVERTICAL none - + 0 wxEXPAND | wxALL 1 - + 1 1 1 @@ -284,7 +286,7 @@ - + panelContainer wxVERTICAL @@ -402,20 +404,20 @@ - + 5 wxEXPAND 0 - + -1,155 bottomContainer wxVERTICAL none - + 5 wxALIGN_CENTER|wxEXPAND 1 - + bSizer36 wxVERTICAL @@ -841,9 +843,6 @@ protected - - protected - Load From Embedded File; D:\OBS2\obs\images\up.ico 0 @@ -1306,9 +1305,6 @@ protected - - protected - Load From Embedded File; D:\OBS2\obs\images\up.ico 0 @@ -2141,7 +2137,7 @@ - + 0 wxAUI_MGR_DEFAULT @@ -2152,7 +2148,7 @@ impl_virtual - Tahoma,90,90,8,70,0 + 0 wxID_ANY @@ -2161,7 +2157,7 @@ 1240,825 wxDEFAULT_FRAME_STYLE - + WindowSubclass; window-subclass.hpp .openBroadcastStudio @@ -2203,16 +2199,16 @@ - + clientSIzer wxVERTICAL none - + 0 wxEXPAND 1 - + 1 1 1 @@ -2286,7 +2282,7 @@ - + mainSizer wxVERTICAL @@ -2815,29 +2811,29 @@ - + 5 wxEXPAND 0 - + bottomSizer wxVERTICAL none - + 5 wxALIGN_CENTER 0 - - 900,170 + + 900,155 bSizer20 wxHORIZONTAL none - + 5 wxEXPAND 1 - + bSizer16 wxVERTICAL @@ -2925,11 +2921,11 @@ - + 2 wxEXPAND | wxALL 1 - + 1 1 1 @@ -3003,7 +2999,7 @@ - + bSizer38 wxVERTICAL @@ -3096,11 +3092,11 @@ - + 0 wxEXPAND 0 - + 1 1 1 @@ -3224,9 +3220,6 @@ protected - - protected - Load From Embedded File; D:\OBS2\obs\images\up.ico 0 @@ -3276,11 +3269,11 @@ - + 5 wxEXPAND 1 - + bSizer17 wxVERTICAL @@ -3368,11 +3361,11 @@ - + 2 wxEXPAND | wxALL 1 - + 1 1 1 @@ -3446,7 +3439,7 @@ - + bSizer37 wxVERTICAL @@ -3539,11 +3532,11 @@ - + 5 wxEXPAND 0 - + 1 1 1 @@ -3685,12 +3678,6 @@ - - protected - - - protected - @@ -3698,11 +3685,11 @@ - + 5 wxEXPAND 1 - + bSizer18 wxVERTICAL @@ -3790,11 +3777,11 @@ - + 2 wxEXPAND | wxALL 1 - + 1 1 1 @@ -3868,7 +3855,7 @@ - + bSizer39 wxVERTICAL @@ -3962,11 +3949,11 @@ - + 5 wxEXPAND 0 - + 1 1 1 @@ -4111,9 +4098,6 @@ protected - - protected - Load From Embedded File; D:\OBS2\obs\images\up.ico 0 @@ -4163,11 +4147,11 @@ - + 5 wxEXPAND 0 - + bSizer19 wxVERTICAL @@ -4255,11 +4239,11 @@ - + 2 wxEXPAND | wxALL 1 - + 1 1 1 @@ -4289,10 +4273,10 @@ wxID_ANY 0 - + -1,-1 0 - + -1,-1 1 m_panel15 1 @@ -4303,7 +4287,7 @@ Resizable 1 - + -1,-1 0 @@ -4333,14 +4317,14 @@ - + bSizer40 wxVERTICAL none 0 - wxEXPAND|wxTOP|wxBOTTOM|wxLEFT + 1 1 @@ -4372,7 +4356,7 @@ wxID_ANY 0 - + -1,-1 0 400,-1 @@ -4388,7 +4372,7 @@ 1 wxLC_REPORT|wxLC_SINGLE_SEL - + ListCtrlFixed; window-subclass.hpp 0 @@ -4443,11 +4427,11 @@ - + 5 wxEXPAND 0 - + 1 1 1 @@ -4568,12 +4552,6 @@ - - protected - - - protected - diff --git a/obs/OBSWindows.h b/obs/OBSWindows.h index 44f4b2f4a..d0e658924 100644 --- a/obs/OBSWindows.h +++ b/obs/OBSWindows.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 8 2012) +// C++ code generated with wxFormBuilder (version Nov 6 2013) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -11,6 +11,10 @@ #include #include #include +class ListCtrlFixed; +class WindowSubclass; + +#include "window-subclass.hpp" #include #include #include @@ -63,7 +67,7 @@ /////////////////////////////////////////////////////////////////////////////// /// Class OBSBasicBase /////////////////////////////////////////////////////////////////////////////// -class OBSBasicBase : public wxFrame +class OBSBasicBase : public WindowSubclass { private: @@ -111,7 +115,7 @@ class OBSBasicBase : public wxFrame public: - OBSBasicBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _(".mainwindow"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 854,614 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL ); + OBSBasicBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _(".mainwindow"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 923,677 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL ); ~OBSBasicBase(); @@ -120,7 +124,7 @@ class OBSBasicBase : public wxFrame /////////////////////////////////////////////////////////////////////////////// /// Class OBSStudioBase /////////////////////////////////////////////////////////////////////////////// -class OBSStudioBase : public wxFrame +class OBSStudioBase : public WindowSubclass { private: @@ -146,7 +150,7 @@ class OBSStudioBase : public wxFrame wxToolBar* m_toolBar12; wxStaticText* m_staticText4; wxPanel* m_panel15; - wxListCtrl* m_listCtrl1; + ListCtrlFixed* m_listCtrl1; wxToolBar* m_toolBar13; wxMenuBar* m_menubar1; wxMenu* m_menu1; diff --git a/obs/makefile.am b/obs/makefile.am index 1c5e04a5e..dbe8854bc 100644 --- a/obs/makefile.am +++ b/obs/makefile.am @@ -11,5 +11,6 @@ endif obs_PROGRAMS = obs # obs_LDADD = $(top_srcdir)/libobs/libobs.la obs_SOURCES = window-obs-basic.cpp \ + window-subclass.cpp \ obs.cpp \ OBSWindows.cpp diff --git a/obs/obs.cpp b/obs/obs.cpp index b7bb3bda9..3fee5f859 100644 --- a/obs/obs.cpp +++ b/obs/obs.cpp @@ -27,7 +27,7 @@ bool OBSApp::OnInit() wxInitAllImageHandlers(); - OBSBasic *mainWindow = new OBSBasic(); + OBSStudioBase *mainWindow = new OBSStudioBase(NULL); mainWindow->Show(); return true; } diff --git a/obs/window-obs-basic.cpp b/obs/window-obs-basic.cpp index cff2e6fee..fb49ab23a 100644 --- a/obs/window-obs-basic.cpp +++ b/obs/window-obs-basic.cpp @@ -7,10 +7,7 @@ (at your option) any later version. This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY -{ -} - without even the implied warranty of + but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. diff --git a/vs/2010/OBS/OBS.vcxproj b/vs/2010/OBS/OBS.vcxproj index f03c86872..37d09c422 100644 --- a/vs/2010/OBS/OBS.vcxproj +++ b/vs/2010/OBS/OBS.vcxproj @@ -170,11 +170,13 @@ + + diff --git a/vs/2010/OBS/OBS.vcxproj.filters b/vs/2010/OBS/OBS.vcxproj.filters index 556e50203..bed3854f6 100644 --- a/vs/2010/OBS/OBS.vcxproj.filters +++ b/vs/2010/OBS/OBS.vcxproj.filters @@ -24,6 +24,9 @@ Source Files + + Source Files + @@ -35,5 +38,8 @@ Header Files + + Header Files + \ No newline at end of file