mirror of
https://github.com/cjcliffe/CubicSDR.git
synced 2026-06-02 14:04:47 -04:00
CLEANUP: some compiler and static analysis warnings
This commit is contained in:
+4
-4
@@ -38,10 +38,10 @@ private:
|
||||
public:
|
||||
typedef enum GLPanelFillType { GLPANEL_FILL_NONE, GLPANEL_FILL_SOLID, GLPANEL_FILL_GRAD_X, GLPANEL_FILL_GRAD_Y, GLPANEL_FILL_GRAD_BAR_X, GLPANEL_FILL_GRAD_BAR_Y } GLPanelFillType;
|
||||
typedef enum GLPanelCoordinateSystem { GLPANEL_Y_DOWN_ZERO_ONE, GLPANEL_Y_UP_ZERO_ONE, GLPANEL_Y_UP, GLPANEL_Y_DOWN } GLPanelCoordinateSystem;
|
||||
float pos[2];
|
||||
float rot[3];
|
||||
float size[2];
|
||||
float view[2];
|
||||
float pos[2] = {0.0f,0.0f};
|
||||
float rot[3] = { 0.0f,0.0f,0.0f };
|
||||
float size[2] = { 0.0f,0.0f };
|
||||
float view[2] = { 0.0f,0.0f };
|
||||
GLPanelFillType fillType;
|
||||
GLPanelCoordinateSystem coord;
|
||||
float marginPx;
|
||||
|
||||
@@ -27,7 +27,7 @@ EVT_LEAVE_WINDOW(UITestCanvas::OnMouseLeftWindow)
|
||||
EVT_ENTER_WINDOW(UITestCanvas::OnMouseEnterWindow)
|
||||
wxEND_EVENT_TABLE()
|
||||
|
||||
UITestCanvas::UITestCanvas(wxWindow *parent, int *dispAttrs) :
|
||||
UITestCanvas::UITestCanvas(wxWindow *parent, std::vector<int> dispAttrs) :
|
||||
InteractiveCanvas(parent, dispAttrs) {
|
||||
|
||||
glContext = new UITestContext(this, &wxGetApp().GetContext(this));
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
class UITestCanvas: public InteractiveCanvas {
|
||||
public:
|
||||
UITestCanvas(wxWindow *parent, int *dispAttrs);
|
||||
UITestCanvas(wxWindow *parent, std::vector<int> dispAttrs);
|
||||
~UITestCanvas();
|
||||
|
||||
private:
|
||||
|
||||
@@ -45,7 +45,7 @@ PrimaryGLContext(canvas, sharedContext), testMeter("TEST",0,100,50) {
|
||||
// testPanel.addChild(&testChildPanel);
|
||||
// testPanel.addChild(&testChildPanel2);
|
||||
// testPanel.addChild(&testChildPanel3);
|
||||
testMeter.setSize(0.1,0.9);
|
||||
testMeter.setSize(0.1f,0.9f);
|
||||
testPanel.addChild(&testMeter);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user