Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Widgets sample: Choice page #76

Merged
merged 6 commits into from
Jun 4, 2022
Merged

Widgets sample: Choice page #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ffbfc32
Support unsigned int params/returns in binding
kenz-gelsoft Jun 2, 2022
d1fdba1
Re-gen wxItemContainerImmutable with uint support
kenz-gelsoft Jun 2, 2022
d4a7a39
Re-gen wxItemContainer with uint support
kenz-gelsoft Jun 2, 2022
7cdf029
widgets: Implement create_content() for choice page
kenz-gelsoft Jun 2, 2022
d520dce
widgets: Implement Choice page roughly
kenz-gelsoft Jun 4, 2022
3c188ab
widgets: Sort pages in alphabetical order
kenz-gelsoft Jun 4, 2022
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 codegen2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def generate_library(classes, config, libname):

def generated_ffi_rs(classes, libname):
yield '''\
use std::os::raw::{c_double, c_int, c_long, c_uchar, c_void};
use std::os::raw::{c_double, c_int, c_long, c_uchar, c_uint, c_void};

pub use crate::ffi::*;

Expand All @@ -69,7 +69,7 @@ def generated_ffi_rs(classes, libname):

def generated_methods_rs(classes, libname):
yield '''\
use std::os::raw::{c_int, c_long, c_void};
use std::os::raw::{c_int, c_long, c_uint, c_void};

use super::*;
use crate::WeakRef;
Expand Down
16 changes: 16 additions & 0 deletions doxybindgen.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,20 @@ blocklist = [
# 'Append4',
# 'Insert4',
# 'Set1',
# # TODO: support `unsigned int` in overload renaming
# 'Append7',
# 'Append8',
# 'Append9',
# 'Insert7',
# 'Insert8',
# 'Insert9',
# 'Set4',
# 'Set5',
# 'Set6',
#]
[types.wxListBox]
blocklist = [
'InsertItems',
'MSWSetTabStops',
]
wx31 = [
Expand Down Expand Up @@ -231,6 +242,11 @@ blocklist = [
'operator/=',
'operator*=',
]
[types.wxRadioBox]
blocklist = [
# FIXME: Conflicts with wxWindow's method, this should be OverloadTree's bug
'Enable',
]
[types.wxRect]
blocklist = [
'operator==',
Expand Down
2 changes: 2 additions & 0 deletions doxybindgen/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
'int': 'c_int',
'long': 'c_long',
'size_t': 'usize',
'unsigned int': 'c_uint',
'wxByte': 'c_uchar',
'wxCheckBoxState': 'c_int',
'wxCoord': 'c_int',
Expand All @@ -32,6 +33,7 @@
'c_int',
'c_long',
'c_uchar',
'c_uint',
'usize',
]
OS_UNSUPPORTED_TYPES = [
Expand Down
2 changes: 1 addition & 1 deletion samples/widgets/src/button.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ impl ConfigUI {
pub struct ButtonWidgetsPage {
pub base: wx::Panel,
config_ui: RefCell<Option<ConfigUI>>,
// the button itself and the sizer it is in
// the button itself
button: Rc<RefCell<Option<wx::Button>>>,
}
impl WidgetsPage for ButtonWidgetsPage {
Expand Down
2 changes: 1 addition & 1 deletion samples/widgets/src/checkbox.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ pub struct ConfigUI {
pub struct CheckBoxWidgetsPage {
pub base: wx::Panel,
config_ui: RefCell<Option<ConfigUI>>,
// the checkbox itself and the sizer it is in
// the checkbox itself
checkbox: Rc<RefCell<Option<wx::CheckBox>>>,
}
impl WidgetsPage for CheckBoxWidgetsPage {
Expand Down
Loading