Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Documentation/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ Tagged releases are published on the [GitHub releases page](https://github.com/j

## Dependencies

* [Objectively](https://github.com/jdolan/Objectively) >= 2.0.0
* [ObjectivelyGPU](https://github.com/jdolan/ObjectivelyGPU) >= 1.0.0
* [Objectively](https://github.com/jdolan/Objectively) >= 2.2.0
* [ObjectivelyGPU](https://github.com/jdolan/ObjectivelyGPU) >= 2.2.0
* [SDL3](https://github.com/libsdl-org/SDL) >= 3.2.0, [SDL3_image](https://github.com/libsdl-org/SDL_image), [SDL3_ttf](https://github.com/libsdl-org/SDL_ttf)

## Building
Expand Down
1 change: 0 additions & 1 deletion Examples/HelloViewController.c
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,6 @@ Class *_HelloViewController(void) {
.name = "HelloViewController",
.superclass = _ViewController(),
.instanceSize = sizeof(HelloViewController),
.interfaceOffset = offsetof(HelloViewController, interface),
.interfaceSize = sizeof(HelloViewControllerInterface),
.initialize = initialize,
});
Expand Down
5 changes: 2 additions & 3 deletions Examples/HelloViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,10 @@ struct HelloViewController {
ViewController viewController;

/**
* @brief The interface.
*
* @brief The interface type.
* @private
*/
HelloViewControllerInterface *interface;
HelloViewControllerInterface *interface[0];

/**
* @brief A Panel.
Expand Down
1 change: 0 additions & 1 deletion Sources/ObjectivelyMVC/Box.c
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ Class *_Box(void) {
.name = "Box",
.superclass = _View(),
.instanceSize = sizeof(Box),
.interfaceOffset = offsetof(Box, interface),
.interfaceSize = sizeof(BoxInterface),
.initialize = initialize,
});
Expand Down
4 changes: 2 additions & 2 deletions Sources/ObjectivelyMVC/Box.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ struct Box {
View view;

/**
* @brief The interface.
* @brief The interface type.
* @protected
*/
BoxInterface *interface;
BoxInterface *interface[0];

/**
* @brief The internal container.
Expand Down
1 change: 0 additions & 1 deletion Sources/ObjectivelyMVC/Button.c
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,6 @@ Class *_Button(void) {
.name = "Button",
.superclass = _Control(),
.instanceSize = sizeof(Button),
.interfaceOffset = offsetof(Button, interface),
.interfaceSize = sizeof(ButtonInterface),
.initialize = initialize,
});
Expand Down
4 changes: 2 additions & 2 deletions Sources/ObjectivelyMVC/Button.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ struct Button {
Control control;

/**
* @brief The interface.
* @brief The interface type.
* @protected
*/
ButtonInterface *interface;
ButtonInterface *interface[0];

/**
* @brief The ButtonDelegate.
Expand Down
1 change: 0 additions & 1 deletion Sources/ObjectivelyMVC/Checkbox.c
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,6 @@ Class *_Checkbox(void) {
.name = "Checkbox",
.superclass = _Control(),
.instanceSize = sizeof(Checkbox),
.interfaceOffset = offsetof(Checkbox, interface),
.interfaceSize = sizeof(CheckboxInterface),
.initialize = initialize,
.destroy = destroy,
Expand Down
4 changes: 2 additions & 2 deletions Sources/ObjectivelyMVC/Checkbox.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ struct Checkbox {
Control control;

/**
* @brief The interface.
* @brief The interface type.
* @protected
*/
CheckboxInterface *interface;
CheckboxInterface *interface[0];

/**
* @brief The CheckboxDelegate.
Expand Down
1 change: 0 additions & 1 deletion Sources/ObjectivelyMVC/CollectionItemView.c
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ Class *_CollectionItemView(void) {
.name = "CollectionItemView",
.superclass = _View(),
.instanceSize = sizeof(CollectionItemView),
.interfaceOffset = offsetof(CollectionItemView, interface),
.interfaceSize = sizeof(CollectionItemViewInterface),
.initialize = initialize,
});
Expand Down
4 changes: 2 additions & 2 deletions Sources/ObjectivelyMVC/CollectionItemView.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ struct CollectionItemView {
View view;

/**
* @brief The interface.
* @brief The interface type.
* @protected
*/
CollectionItemViewInterface *interface;
CollectionItemViewInterface *interface[0];

/**
* @brief The ImageView.
Expand Down
1 change: 0 additions & 1 deletion Sources/ObjectivelyMVC/CollectionView.c
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,6 @@ Class *_CollectionView(void) {
.name = "CollectionView",
.superclass = _Control(),
.instanceSize = sizeof(CollectionView),
.interfaceOffset = offsetof(CollectionView, interface),
.interfaceSize = sizeof(CollectionViewInterface),
.initialize = initialize,
});
Expand Down
4 changes: 2 additions & 2 deletions Sources/ObjectivelyMVC/CollectionView.h
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,10 @@ struct CollectionView {
Control control;

/**
* @brief The interface.
* @brief The interface type.
* @protected
*/
CollectionViewInterface *interface;
CollectionViewInterface *interface[0];

/**
* @brief The layout axis.
Expand Down
1 change: 0 additions & 1 deletion Sources/ObjectivelyMVC/Control.c
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,6 @@ Class *_Control(void) {
.name = "Control",
.superclass = _View(),
.instanceSize = sizeof(Control),
.interfaceOffset = offsetof(Control, interface),
.interfaceSize = sizeof(ControlInterface),
.initialize = initialize,
});
Expand Down
4 changes: 2 additions & 2 deletions Sources/ObjectivelyMVC/Control.h
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@ struct Control {
View view;

/**
* @brief The interface.
* @brief The interface type.
* @protected
*/
ControlInterface *interface;
ControlInterface *interface[0];

/**
* @brief The ControlBevel.
Expand Down
1 change: 0 additions & 1 deletion Sources/ObjectivelyMVC/DebugViewController.c
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,6 @@ Class *_DebugViewController(void) {
.name = "DebugViewController",
.superclass = _ViewController(),
.instanceSize = sizeof(DebugViewController),
.interfaceOffset = offsetof(DebugViewController, interface),
.interfaceSize = sizeof(DebugViewControllerInterface),
.initialize = initialize,
});
Expand Down
4 changes: 2 additions & 2 deletions Sources/ObjectivelyMVC/DebugViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ struct DebugViewController {
ViewController viewController;

/**
* @brief The interface.
* @brief The interface type.
* @protected
*/
DebugViewControllerInterface *interface;
DebugViewControllerInterface *interface[0];

/**
* @brief The View to debug.
Expand Down
1 change: 0 additions & 1 deletion Sources/ObjectivelyMVC/Font.c
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,6 @@ Class *_Font(void) {
.name = "Font",
.superclass = _Object(),
.instanceSize = sizeof(Font),
.interfaceOffset = offsetof(Font, interface),
.interfaceSize = sizeof(FontInterface),
.initialize = initialize,
.destroy = destroy,
Expand Down
4 changes: 2 additions & 2 deletions Sources/ObjectivelyMVC/Font.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ struct Font {
Object object;

/**
* @brief The interface.
* @brief The interface type.
* @protected
*/
FontInterface *interface;
FontInterface *interface[0];

/**
* @brief The raw font data.
Expand Down
1 change: 0 additions & 1 deletion Sources/ObjectivelyMVC/HSVColorPicker.c
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,6 @@ Class *_HSVColorPicker(void) {
.name = "HSVColorPicker",
.superclass = _Control(),
.instanceSize = sizeof(HSVColorPicker),
.interfaceOffset = offsetof(HSVColorPicker, interface),
.interfaceSize = sizeof(HSVColorPickerInterface),
.initialize = initialize,
});
Expand Down
4 changes: 2 additions & 2 deletions Sources/ObjectivelyMVC/HSVColorPicker.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ struct HSVColorPicker {
Control control;

/**
* @brief The interface.
* @brief The interface type.
* @protected
*/
HSVColorPickerInterface *interface;
HSVColorPickerInterface *interface[0];

/**
* @brief The color preview.
Expand Down
1 change: 0 additions & 1 deletion Sources/ObjectivelyMVC/HueColorPicker.c
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,6 @@ Class *_HueColorPicker(void) {
.name = "HueColorPicker",
.superclass = _Control(),
.instanceSize = sizeof(HueColorPicker),
.interfaceOffset = offsetof(HueColorPicker, interface),
.interfaceSize = sizeof(HueColorPickerInterface),
.initialize = initialize,
});
Expand Down
4 changes: 2 additions & 2 deletions Sources/ObjectivelyMVC/HueColorPicker.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ struct HueColorPicker {
Control control;

/**
* @brief The interface.
* @brief The interface type.
* @protected
*/
HueColorPickerInterface *interface;
HueColorPickerInterface *interface[0];

/**
* @brief The hue preview.
Expand Down
1 change: 0 additions & 1 deletion Sources/ObjectivelyMVC/Image.c
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,6 @@ Class *_Image(void) {
.name = "Image",
.superclass = _Object(),
.instanceSize = sizeof(Image),
.interfaceOffset = offsetof(Image, interface),
.interfaceSize = sizeof(ImageInterface),
.initialize = initialize,
});
Expand Down
4 changes: 2 additions & 2 deletions Sources/ObjectivelyMVC/Image.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ struct Image {
Object object;

/**
* @brief The interface.
* @brief The interface type.
* @protected
*/
ImageInterface *interface;
ImageInterface *interface[0];

/**
* @brief The backing surface.
Expand Down
1 change: 0 additions & 1 deletion Sources/ObjectivelyMVC/ImageView.c
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,6 @@ Class *_ImageView(void) {
.name = "ImageView",
.superclass = _View(),
.instanceSize = sizeof(ImageView),
.interfaceOffset = offsetof(ImageView, interface),
.interfaceSize = sizeof(ImageViewInterface),
.initialize = initialize,
});
Expand Down
4 changes: 2 additions & 2 deletions Sources/ObjectivelyMVC/ImageView.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ struct ImageView {
View view;

/**
* @brief The interface.
* @brief The interface type.
* @protected
*/
ImageViewInterface *interface;
ImageViewInterface *interface[0];

/**
* @brief The blend factors (currently unused; reserved for future per-pipeline support).
Expand Down
1 change: 0 additions & 1 deletion Sources/ObjectivelyMVC/Input.c
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,6 @@ Class *_Input(void) {
.name = "Input",
.superclass = _StackView(),
.instanceSize = sizeof(Input),
.interfaceOffset = offsetof(Input, interface),
.interfaceSize = sizeof(InputInterface),
.initialize = initialize,
});
Expand Down
4 changes: 2 additions & 2 deletions Sources/ObjectivelyMVC/Input.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ struct Input {
StackView stackView;

/**
* @brief The interface.
* @brief The interface type.
* @protected
*/
InputInterface *interface;
InputInterface *interface[0];

/**
* @brief The Control.
Expand Down
1 change: 0 additions & 1 deletion Sources/ObjectivelyMVC/Label.c
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ Class *_Label(void) {
.name = "Label",
.superclass = _View(),
.instanceSize = sizeof(Label),
.interfaceOffset = offsetof(Label, interface),
.interfaceSize = sizeof(LabelInterface),
.initialize = initialize,
});
Expand Down
4 changes: 2 additions & 2 deletions Sources/ObjectivelyMVC/Label.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ struct Label {
View view;

/**
* @brief The interface.
* @brief The interface type.
* @protected
*/
LabelInterface *interface;
LabelInterface *interface[0];

/**
* @brief The Label Text.
Expand Down
1 change: 1 addition & 0 deletions Sources/ObjectivelyMVC/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ libObjectivelyMVC_la_CFLAGS = \
@SDL3_CFLAGS@

libObjectivelyMVC_la_LDFLAGS = \
-release @RELEASE_VERSION@ \
@HOST_LDFLAGS@
Comment thread
jdolan marked this conversation as resolved.

libObjectivelyMVC_la_LIBADD = \
Expand Down
1 change: 0 additions & 1 deletion Sources/ObjectivelyMVC/NavigationViewController.c
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@ Class *_NavigationViewController(void) {
.name = "NavigationViewController",
.superclass = _ViewController(),
.instanceSize = sizeof(NavigationViewController),
.interfaceOffset = offsetof(NavigationViewController, interface),
.interfaceSize = sizeof(NavigationViewControllerInterface),
.initialize = initialize,
});
Expand Down
4 changes: 2 additions & 2 deletions Sources/ObjectivelyMVC/NavigationViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ struct NavigationViewController {
ViewController viewController;

/**
* @brief The interface.
* @brief The interface type.
* @protected
*/
NavigationViewControllerInterface *interface;
NavigationViewControllerInterface *interface[0];
};

/**
Expand Down
1 change: 0 additions & 1 deletion Sources/ObjectivelyMVC/Option.c
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ Class *_Option(void) {
.name = "Option",
.superclass = _View(),
.instanceSize = sizeof(Option),
.interfaceOffset = offsetof(Option, interface),
.interfaceSize = sizeof(OptionInterface),
.initialize = initialize,
});
Expand Down
4 changes: 2 additions & 2 deletions Sources/ObjectivelyMVC/Option.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ struct Option {
View view;

/**
* @brief The interface.
* @brief The interface type.
* @protected
*/
OptionInterface *interface;
OptionInterface *interface[0];

/**
* @brief True if this Option is selected, false otherwise.
Expand Down
1 change: 0 additions & 1 deletion Sources/ObjectivelyMVC/PageView.c
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@ Class *_PageView(void) {
.name = "PageView",
.superclass = _View(),
.instanceSize = sizeof(PageView),
.interfaceOffset = offsetof(PageView, interface),
.interfaceSize = sizeof(PageViewInterface),
.initialize = initialize,
});
Expand Down
4 changes: 2 additions & 2 deletions Sources/ObjectivelyMVC/PageView.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ struct PageView {
View view;

/**
* @brief The interface.
* @brief The interface type.
* @protected
*/
PageViewInterface *interface;
PageViewInterface *interface[0];

/**
* @brief The index of the current page.
Expand Down
Loading
Loading