added support for jansson, added new output files, made some adjustments to the API, fixed a UI subclass issue
This commit is contained in:
@@ -16,7 +16,7 @@
|
||||
******************************************************************************/
|
||||
|
||||
#include "window-obs-basic.hpp"
|
||||
|
||||
/*
|
||||
void OBSBasic::file_newOnMenuSelection(wxCommandEvent& event)
|
||||
{
|
||||
}
|
||||
@@ -80,3 +80,4 @@ void OBSBasic::sourceUpOnToolClicked(wxCommandEvent& event)
|
||||
void OBSBasic::sourceDownOnToolClicked(wxCommandEvent& event)
|
||||
{
|
||||
}
|
||||
*/
|
@@ -19,7 +19,7 @@
|
||||
|
||||
#include "OBSWindows.h"
|
||||
|
||||
|
||||
/*
|
||||
class OBSBasic : public OBSBasicBase {
|
||||
protected:
|
||||
virtual void file_newOnMenuSelection(wxCommandEvent& event);
|
||||
@@ -42,3 +42,4 @@ protected:
|
||||
public:
|
||||
inline OBSBasic() : OBSBasicBase(NULL) {}
|
||||
};
|
||||
*/
|
@@ -64,6 +64,19 @@ WindowSubclass::WindowSubclass(wxWindow* parent, wxWindowID id,
|
||||
#endif
|
||||
}
|
||||
|
||||
ListCtrlFixed::ListCtrlFixed(wxWindow *parent,
|
||||
wxWindowID id,
|
||||
const wxPoint& pos,
|
||||
const wxSize& size,
|
||||
long style,
|
||||
const wxValidator& validator,
|
||||
const wxString& name)
|
||||
: wxListCtrl(parent, id, pos, size, style, validator, name)
|
||||
{
|
||||
m_bestSizeCache.Set(wxDefaultCoord, wxDefaultCoord);
|
||||
SetInitialSize(size);
|
||||
}
|
||||
|
||||
wxSize ListCtrlFixed::DoGetBestClientSize() const
|
||||
{
|
||||
if (!InReportView())
|
||||
|
@@ -36,17 +36,13 @@ public:
|
||||
*/
|
||||
class ListCtrlFixed : public wxListCtrl {
|
||||
public:
|
||||
inline ListCtrlFixed(wxWindow *parent,
|
||||
ListCtrlFixed(wxWindow *parent,
|
||||
wxWindowID id = wxID_ANY,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = wxLC_ICON,
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxListCtrlNameStr)
|
||||
: wxListCtrl(parent, id, pos, size, style, validator, name)
|
||||
{
|
||||
}
|
||||
const wxString& name = wxListCtrlNameStr);
|
||||
|
||||
protected:
|
||||
virtual wxSize DoGetBestClientSize() const;
|
||||
};
|
||||
|
Reference in New Issue
Block a user