Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VTK
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lucas Gandel
VTK
Commits
54b89bbd
Commit
54b89bbd
authored
10 months ago
by
Jaswant Panchumarti (Kitware)
Browse files
Options
Downloads
Patches
Plain Diff
Exclude marshalling of context parameters in Cocoa, Win32 OpenGL render window
parent
b9475734
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Rendering/OpenGL2/vtkCocoaRenderWindow.h
+10
-0
10 additions, 0 deletions
Rendering/OpenGL2/vtkCocoaRenderWindow.h
Rendering/OpenGL2/vtkWin32OpenGLRenderWindow.h
+3
-0
3 additions, 0 deletions
Rendering/OpenGL2/vtkWin32OpenGLRenderWindow.h
with
13 additions
and
0 deletions
Rendering/OpenGL2/vtkCocoaRenderWindow.h
+
10
−
0
View file @
54b89bbd
...
...
@@ -289,7 +289,9 @@ public:
/**
* Accessors for the OpenGL context (Really an NSOpenGLContext*).
*/
VTK_MARSHALEXCLUDE
(
VTK_MARSHAL_EXCLUDE_REASON_NOT_SUPPORTED
)
void
SetContextId
(
void
*
);
VTK_MARSHALEXCLUDE
(
VTK_MARSHAL_EXCLUDE_REASON_NOT_SUPPORTED
)
void
*
GetContextId
();
void
*
GetGenericContext
()
override
{
return
this
->
GetContextId
();
}
///@}
...
...
@@ -304,11 +306,13 @@ public:
* and SetWindowId(), respectively, early on (before WindowInitialize()
* is executed). In the case of Java, you should call only SetWindowId().
*/
VTK_MARSHALEXCLUDE
(
VTK_MARSHAL_EXCLUDE_REASON_NOT_SUPPORTED
)
virtual
void
SetRootWindow
(
void
*
);
/**
* Returns the NSWindow* associated with this vtkRenderWindow.
*/
VTK_MARSHALEXCLUDE
(
VTK_MARSHAL_EXCLUDE_REASON_NOT_SUPPORTED
)
virtual
void
*
GetRootWindow
();
/**
...
...
@@ -321,11 +325,13 @@ public:
* and SetWindowId(), respectively, early on (before WindowInitialize()
* is executed). In the case of Java, you should call only SetWindowId().
*/
VTK_MARSHALEXCLUDE
(
VTK_MARSHAL_EXCLUDE_REASON_NOT_SUPPORTED
)
void
SetWindowId
(
void
*
)
override
;
/**
* Returns the NSView* associated with this vtkRenderWindow.
*/
VTK_MARSHALEXCLUDE
(
VTK_MARSHAL_EXCLUDE_REASON_NOT_SUPPORTED
)
virtual
void
*
GetWindowId
();
void
*
GetGenericWindowId
()
override
{
return
this
->
GetWindowId
();
}
...
...
@@ -335,6 +341,7 @@ public:
* NSView that the vtkRenderWindow will create within this parent.
* If you set the WindowId, then this ParentId will be ignored.
*/
VTK_MARSHALEXCLUDE
(
VTK_MARSHAL_EXCLUDE_REASON_NOT_SUPPORTED
)
void
SetParentId
(
void
*
nsview
)
override
;
/**
...
...
@@ -342,6 +349,7 @@ public:
* return "NULL" if the parent was not set with SetParentId() or
* SetParentInfo().
*/
VTK_MARSHALEXCLUDE
(
VTK_MARSHAL_EXCLUDE_REASON_NOT_SUPPORTED
)
virtual
void
*
GetParentId
();
void
*
GetGenericParentId
()
override
{
return
this
->
GetParentId
();
}
...
...
@@ -371,7 +379,9 @@ public:
/**
* Accessors for the pixel format object (Really an NSOpenGLPixelFormat*).
*/
VTK_MARSHALEXCLUDE
(
VTK_MARSHAL_EXCLUDE_REASON_NOT_SUPPORTED
)
void
SetPixelFormat
(
void
*
pixelFormat
);
VTK_MARSHALEXCLUDE
(
VTK_MARSHAL_EXCLUDE_REASON_NOT_SUPPORTED
)
void
*
GetPixelFormat
();
///@}
...
...
This diff is collapsed.
Click to expand it.
Rendering/OpenGL2/vtkWin32OpenGLRenderWindow.h
+
3
−
0
View file @
54b89bbd
...
...
@@ -152,13 +152,16 @@ public:
/**
* Get the window id.
*/
VTK_MARSHALEXCLUDE
(
VTK_MARSHAL_EXCLUDE_REASON_NOT_SUPPORTED
)
HWND
GetWindowId
();
///@{
/**
* Set the window id to a pre-existing window.
*/
VTK_MARSHALEXCLUDE
(
VTK_MARSHAL_EXCLUDE_REASON_NOT_SUPPORTED
)
void
SetWindowId
(
HWND
);
VTK_MARSHALEXCLUDE
(
VTK_MARSHAL_EXCLUDE_REASON_NOT_SUPPORTED
)
void
SetWindowId
(
void
*
foo
)
override
{
this
->
SetWindowId
((
HWND
)
foo
);
}
///@}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment