diff --git a/doc/index.html b/doc/index.html index cff64ea..7902ce6 100644 --- a/doc/index.html +++ b/doc/index.html @@ -2878,7 +2878,7 @@
void MwListBoxInsert ( +MWDECL void MwListBoxInsert ( MwWidget handle, int index, MwLLPixmap pixmap, @@ -2914,7 +2914,7 @@
-void MwListBoxInsertMultiple ( +MWDECL void MwListBoxInsertMultiple ( MwWidget handle, int index, int count, @@ -2957,7 +2957,7 @@
-void MwListBoxVaInsert ( +MWDECL void MwListBoxVaInsert ( MwWidget handle, int index, MwLLPixmap pixmap, @@ -2993,7 +2993,7 @@
-void MwListBoxVaInsertMultiple ( +MWDECL void MwListBoxVaInsertMultiple ( MwWidget handle, int index, int count, diff --git a/include/Mw/StringDefs.h b/include/Mw/StringDefs.h index ff19432..6254499 100644 --- a/include/Mw/StringDefs.h +++ b/include/Mw/StringDefs.h @@ -47,6 +47,6 @@ #define MwNcloseHandler "Cclose" /* NULL */ #define MwNfocusInHandler "CfocusIn" /* NULL */ #define MwNfocusOutHandler "CfocusOut" /* NULL */ -#define MwNfileChosenHandler "CfileChosen" /* char* */ +#define MwNfileChosenHandler "CfileChosen" /* char* */ #endif diff --git a/include/Mw/Widget/ListBox.h b/include/Mw/Widget/ListBox.h index 38f3bf2..d906e84 100644 --- a/include/Mw/Widget/ListBox.h +++ b/include/Mw/Widget/ListBox.h @@ -27,7 +27,7 @@ MWDECL MwClass MwListBoxClass; * %param pixmap Pixmap * %param ... Text */ -void MwListBoxInsert(MwWidget handle, int index, MwLLPixmap pixmap, ...); /* VA_HINT:pixmap */ +MWDECL void MwListBoxInsert(MwWidget handle, int index, MwLLPixmap pixmap, ...); /* VA_HINT:pixmap */ /*! * %brief Inserts multiple items on the listbox @@ -37,7 +37,7 @@ void MwListBoxInsert(MwWidget handle, int index, MwLLPixmap pixmap, ...); /* VA_ * %param pixmap Pixmap * %param ... Text */ -void MwListBoxInsertMultiple(MwWidget handle, int index, int count, MwLLPixmap* pixmap, ...); /* VA_HINT:pixmap */ +MWDECL void MwListBoxInsertMultiple(MwWidget handle, int index, int count, MwLLPixmap* pixmap, ...); /* VA_HINT:pixmap */ /*! * %brief Inserts item on the listbox diff --git a/include/MwOO/Widget/ListBox.h b/include/MwOO/Widget/ListBox.h index 36d03ca..08ebe48 100644 --- a/include/MwOO/Widget/ListBox.h +++ b/include/MwOO/Widget/ListBox.h @@ -12,10 +12,6 @@ class ListBox : public MwOO::Base { void InsertMultiple(int index, int count, MwLLPixmap* pixmap, ...); void VaInsert(int index, MwLLPixmap pixmap, va_list va); void VaInsertMultiple(int index, int count, MwLLPixmap* pixmap, va_list va); - void Delete(int index); - const char* Get(int index); - void SetWidth(int index, int width); - void Reset(void); void SetLeftPadding(int value); int GetLeftPadding(void); void SetBackground(const char* value); diff --git a/include/MwOO/Widget/Menu.h b/include/MwOO/Widget/Menu.h index 003e480..e8e3485 100644 --- a/include/MwOO/Widget/Menu.h +++ b/include/MwOO/Widget/Menu.h @@ -8,7 +8,6 @@ namespace MwOO { class Menu : public MwOO::Base { public: Menu(const char* widget_name, MwOO::Base* parent, int x, int y, int w, int h); - MwMenu Add(MwMenu menu, const char* name); void SetBackground(const char* value); const char* GetBackground(void); void SetForeground(const char* value); diff --git a/include/MwOO/Widget/OpenGL.h b/include/MwOO/Widget/OpenGL.h index 72b3009..9fc32b1 100644 --- a/include/MwOO/Widget/OpenGL.h +++ b/include/MwOO/Widget/OpenGL.h @@ -8,9 +8,6 @@ namespace MwOO { class OpenGL : public MwOO::Base { public: OpenGL(const char* widget_name, MwOO::Base* parent, int x, int y, int w, int h); - void MakeCurrent(void); - void* GetProcAddress(const char* name); - void SwapBuffer(void); void SetBackground(const char* value); const char* GetBackground(void); void SetForeground(const char* value); diff --git a/include/MwOO/Widget/ScrollBar.h b/include/MwOO/Widget/ScrollBar.h index da210d8..8fb81e3 100644 --- a/include/MwOO/Widget/ScrollBar.h +++ b/include/MwOO/Widget/ScrollBar.h @@ -8,7 +8,6 @@ namespace MwOO { class ScrollBar : public MwOO::Base { public: ScrollBar(const char* widget_name, MwOO::Base* parent, int x, int y, int w, int h); - int GetVisibleLength(void); void SetAreaShown(int value); int GetAreaShown(void); void SetValue(int value); diff --git a/include/MwOO/Widget/SubMenu.h b/include/MwOO/Widget/SubMenu.h index 431f9f4..b3223d0 100644 --- a/include/MwOO/Widget/SubMenu.h +++ b/include/MwOO/Widget/SubMenu.h @@ -8,7 +8,6 @@ namespace MwOO { class SubMenu : public MwOO::Base { public: SubMenu(const char* widget_name, MwOO::Base* parent, int x, int y, int w, int h); - void Appear(MwMenu menu, MwPoint* point); void SetBackground(const char* value); const char* GetBackground(void); void SetForeground(const char* value); diff --git a/include/MwOO/Widget/Viewport.h b/include/MwOO/Widget/Viewport.h index ac1b482..158e3d3 100644 --- a/include/MwOO/Widget/Viewport.h +++ b/include/MwOO/Widget/Viewport.h @@ -8,8 +8,6 @@ namespace MwOO { class Viewport : public MwOO::Base { public: Viewport(const char* widget_name, MwOO::Base* parent, int x, int y, int w, int h); - MwOO::Base GetViewport(void); - void SetSize(int w, int h); void SetBackground(const char* value); const char* GetBackground(void); void SetForeground(const char* value); diff --git a/include/MwOO/Widget/Vulkan.h b/include/MwOO/Widget/Vulkan.h index 8d3940e..97ca137 100644 --- a/include/MwOO/Widget/Vulkan.h +++ b/include/MwOO/Widget/Vulkan.h @@ -11,7 +11,6 @@ class Vulkan : public MwOO::Base { void EnableExtension(void); void EnableLayer(void); void Configure(void); - void* GetField(MwVulkanField field, MwErrorEnum* out); VkBool32 Supported(void); void SetBackground(const char* value); const char* GetBackground(void); diff --git a/include/MwOO/Widget/Window.h b/include/MwOO/Widget/Window.h index 4135ffa..7148b4f 100644 --- a/include/MwOO/Widget/Window.h +++ b/include/MwOO/Widget/Window.h @@ -8,7 +8,6 @@ namespace MwOO { class Window : public MwOO::Base { public: Window(const char* widget_name, MwOO::Base* parent, int x, int y, int w, int h); - void MakeBorderless(int toggle); void SetTitle(const char* value); const char* GetTitle(void); void SetMain(int value); diff --git a/oosrc/widget/listbox.cc b/oosrc/widget/listbox.cc index f024b21..df82542 100644 --- a/oosrc/widget/listbox.cc +++ b/oosrc/widget/listbox.cc @@ -27,24 +27,6 @@ void MwOO::ListBox::VaInsertMultiple(int index, int count, MwLLPixmap* pixmap, v MwListBoxVaInsertMultiple(this->widget, index, count, pixmap, va); } -void MwOO::ListBox::Delete(int index){ - MwListBoxDelete(this->widget, index); -} - -const char* MwOO::ListBox::Get(int index){ - const char* ret; - ret = MwListBoxGet(this->widget, index); - return ret; -} - -void MwOO::ListBox::SetWidth(int index, int width){ - MwListBoxSetWidth(this->widget, index, width); -} - -void MwOO::ListBox::Reset(void){ - MwListBoxReset(this->widget); -} - void MwOO::ListBox::SetLeftPadding(int value){ MwSetInteger(this->widget, MwNleftPadding, value); } diff --git a/oosrc/widget/menu.cc b/oosrc/widget/menu.cc index 09ba2fc..63a37c7 100644 --- a/oosrc/widget/menu.cc +++ b/oosrc/widget/menu.cc @@ -5,12 +5,6 @@ MwOO::Menu::Menu(const char* widget_name, MwOO::Base* parent, int x, int y, int w, int h) : MwOO::Base(MwMenuClass, widget_name, parent, x, y, w, h){ } -MwMenu MwOO::Menu::Add(MwMenu menu, const char* name){ - MwMenu ret; - ret = MwMenuAdd(this->widget, menu, name); - return ret; -} - void MwOO::Menu::SetBackground(const char* value){ MwSetText(this->widget, MwNbackground, value); } diff --git a/oosrc/widget/opengl.cc b/oosrc/widget/opengl.cc index a42f3c3..19f388d 100644 --- a/oosrc/widget/opengl.cc +++ b/oosrc/widget/opengl.cc @@ -5,20 +5,6 @@ MwOO::OpenGL::OpenGL(const char* widget_name, MwOO::Base* parent, int x, int y, int w, int h) : MwOO::Base(MwOpenGLClass, widget_name, parent, x, y, w, h){ } -void MwOO::OpenGL::MakeCurrent(void){ - MwOpenGLMakeCurrent(this->widget); -} - -void* MwOO::OpenGL::GetProcAddress(const char* name){ - void* ret; - ret = MwOpenGLGetProcAddress(this->widget, name); - return ret; -} - -void MwOO::OpenGL::SwapBuffer(void){ - MwOpenGLSwapBuffer(this->widget); -} - void MwOO::OpenGL::SetBackground(const char* value){ MwSetText(this->widget, MwNbackground, value); } diff --git a/oosrc/widget/scrollbar.cc b/oosrc/widget/scrollbar.cc index e1e29ca..f6a2344 100644 --- a/oosrc/widget/scrollbar.cc +++ b/oosrc/widget/scrollbar.cc @@ -5,12 +5,6 @@ MwOO::ScrollBar::ScrollBar(const char* widget_name, MwOO::Base* parent, int x, int y, int w, int h) : MwOO::Base(MwScrollBarClass, widget_name, parent, x, y, w, h){ } -int MwOO::ScrollBar::GetVisibleLength(void){ - int ret; - ret = MwScrollBarGetVisibleLength(this->widget); - return ret; -} - void MwOO::ScrollBar::SetAreaShown(int value){ MwSetInteger(this->widget, MwNareaShown, value); } diff --git a/oosrc/widget/submenu.cc b/oosrc/widget/submenu.cc index 6a98cbe..98f8145 100644 --- a/oosrc/widget/submenu.cc +++ b/oosrc/widget/submenu.cc @@ -5,10 +5,6 @@ MwOO::SubMenu::SubMenu(const char* widget_name, MwOO::Base* parent, int x, int y, int w, int h) : MwOO::Base(MwSubMenuClass, widget_name, parent, x, y, w, h){ } -void MwOO::SubMenu::Appear(MwMenu menu, MwPoint* point){ - MwSubMenuAppear(this->widget, menu, point); -} - void MwOO::SubMenu::SetBackground(const char* value){ MwSetText(this->widget, MwNbackground, value); } diff --git a/oosrc/widget/viewport.cc b/oosrc/widget/viewport.cc index 4b5d6ef..c3c4190 100644 --- a/oosrc/widget/viewport.cc +++ b/oosrc/widget/viewport.cc @@ -5,16 +5,6 @@ MwOO::Viewport::Viewport(const char* widget_name, MwOO::Base* parent, int x, int y, int w, int h) : MwOO::Base(MwViewportClass, widget_name, parent, x, y, w, h){ } -MwOO::Base MwOO::Viewport::GetViewport(void){ - MwOO::Base ret; - ret = MwOO::Base(MwViewportGetViewport(this->widget)); - return ret; -} - -void MwOO::Viewport::SetSize(int w, int h){ - MwViewportSetSize(this->widget, w, h); -} - void MwOO::Viewport::SetBackground(const char* value){ MwSetText(this->widget, MwNbackground, value); } diff --git a/oosrc/widget/vulkan.cc b/oosrc/widget/vulkan.cc index 52afc7c..81d89f3 100644 --- a/oosrc/widget/vulkan.cc +++ b/oosrc/widget/vulkan.cc @@ -17,12 +17,6 @@ void MwOO::Vulkan::Configure(void){ MwVulkanConfigure(this->widget); } -void* MwOO::Vulkan::GetField(MwVulkanField field, MwErrorEnum* out){ - void* ret; - ret = MwVulkanGetField(this->widget, field, out); - return ret; -} - VkBool32 MwOO::Vulkan::Supported(void){ VkBool32 ret; ret = MwVulkanSupported(this->widget); diff --git a/oosrc/widget/window.cc b/oosrc/widget/window.cc index b27df5e..0ab0398 100644 --- a/oosrc/widget/window.cc +++ b/oosrc/widget/window.cc @@ -5,10 +5,6 @@ MwOO::Window::Window(const char* widget_name, MwOO::Base* parent, int x, int y, int w, int h) : MwOO::Base(MwWindowClass, widget_name, parent, x, y, w, h){ } -void MwOO::Window::MakeBorderless(int toggle){ - MwWindowMakeBorderless(this->widget, toggle); -} - void MwOO::Window::SetTitle(const char* value){ MwSetText(this->widget, MwNtitle, value); } diff --git a/src/widget/scrollbar.c b/src/widget/scrollbar.c index 6dc69a8..b471871 100644 --- a/src/widget/scrollbar.c +++ b/src/widget/scrollbar.c @@ -132,7 +132,7 @@ static void draw(MwWidget handle) { } static void mouse_move(MwWidget handle) { - int or = MwGetInteger(handle, MwNorientation); + int or = MwGetInteger(handle, MwNorientation); scrollbar_t* scr = handle->internal; if(!handle->pressed) return; @@ -160,9 +160,9 @@ static void mouse_move(MwWidget handle) { } static void mouse_down(MwWidget handle, void* ptr) { - int ww = MwGetInteger(handle, MwNwidth); - int wh = MwGetInteger(handle, MwNheight); - int or = MwGetInteger(handle, MwNorientation); + int ww = MwGetInteger(handle, MwNwidth); + int wh = MwGetInteger(handle, MwNheight); + int or = MwGetInteger(handle, MwNorientation); scrollbar_t* scr = handle->internal; MwLLMouse* m = ptr;