add label

git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@213 b9cfdab3-6d41-4d17-bbe4-086880011989

include/Mw/Constants.h

@@ -24,4 +24,13 @@ enum MwORIENTATION {
 	MwHORIZONTAL
 };
 
+/*!
+ * %brief Alignment
+ */
+enum MwALIGNMENT {
+	MwALIGNMENT_CENTER = 0,
+	MwALIGNMENT_BEGINNING,
+	MwALIGNMENT_END,
+};
+
 #endif

include/Mw/Milsko.h

@@ -22,6 +22,7 @@
 #include <Mw/Widget/Menu.h>
 #include <Mw/Widget/SubMenu.h>
 #include <Mw/Widget/Button.h>
+#include <Mw/Widget/Label.h>
 #include <Mw/Widget/CheckBox.h>
 #include <Mw/Widget/Frame.h>
 #include <Mw/Widget/Image.h>

include/Mw/StringDefs.h

@@ -16,6 +16,7 @@
 #define MwNvalue "Ivalue"
 #define MwNareaShown "IareaShown"
 #define MwNchecked "Ichecked"
+#define MwNalignment "Ialignment"
 
 #define MwNtitle "Stitle"
 #define MwNtext "Stext"

include/Mw/Widget/Button.h

@@ -2,7 +2,7 @@
 /*!
  * %file Mw/Widget/Button.h
  * %brief Button widget
- * %prop MwNpixmap
+ * %prop MwNpixmap MwNtext
  */
 #ifndef __MW_WIDGET_BUTTON_H__
 #define __MW_WIDGET_BUTTON_H__

include/Mw/Widget/CheckBox.h

@@ -2,7 +2,7 @@
 /*!
  * %file Mw/Widget/CheckBox.h
  * %brief CheckBox widget
- * %prop MwNpixmap
+ * %prop MwNchecked
  */
 #ifndef __MW_WIDGET_CHECKBOX_H__
 #define __MW_WIDGET_CHECKBOX_H__

include/Mw/Widget/Label.h

@@ -0,0 +1,26 @@
+/* $Id$ */
+/*!
+ * %file Mw/Widget/Label.h
+ * %brief Label widget
+ * %prop MwNtext MwNalignment
+ */
+#ifndef __MW_WIDGET_LABEL_H__
+#define __MW_WIDGET_LABEL_H__
+
+#include <Mw/MachDep.h>
+#include <Mw/TypeDefs.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*!
+ * %brief Label widget class
+ */
+MWDECL MwClass MwLabelClass;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

include/Mw/Widget/Window.h

@@ -2,6 +2,7 @@
 /*!
  * %file Mw/Widget/Window.h
  * %brief Window widget
+ * %prop MwNtitle
  */
 #ifndef __MW_WIDGET_WINDOW_H__
 #define __MW_WIDGET_WINDOW_H__

include/MwOO/Widget/Button.h

@@ -8,8 +8,10 @@ namespace MwOO {
 class Button : public MwOO::Base {
       public:
 	Button(const char* widget_name, MwOO::Base* parent, int x, int y, int w, int h);
-	void  SetPixmap(void* value);
-	void* GetPixmap(void);
+	void	    SetPixmap(void* value);
+	void*	    GetPixmap(void);
+	void	    SetText(const char* value);
+	const char* GetText(void);
 };
 } // namespace MwOO
 

include/MwOO/Widget/CheckBox.h

@@ -8,8 +8,8 @@ namespace MwOO {
 class CheckBox : public MwOO::Base {
       public:
 	CheckBox(const char* widget_name, MwOO::Base* parent, int x, int y, int w, int h);
-	void  SetPixmap(void* value);
-	void* GetPixmap(void);
+	void SetChecked(int value);
+	int  GetChecked(void);
 };
 } // namespace MwOO
 

include/MwOO/Widget/Label.h

@@ -0,0 +1,18 @@
+/* $Id$ */
+#ifndef __MWOO_WIDGET_LABEL_H__
+#define __MWOO_WIDGET_LABEL_H__
+
+#include <MwOO/Base.h>
+
+namespace MwOO {
+class Label : public MwOO::Base {
+      public:
+	Label(const char* widget_name, MwOO::Base* parent, int x, int y, int w, int h);
+	void	    SetText(const char* value);
+	const char* GetText(void);
+	void	    SetAlignment(int value);
+	int	    GetAlignment(void);
+};
+} // namespace MwOO
+
+#endif

include/MwOO/Widget/Window.h

@@ -8,6 +8,8 @@ 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	    SetTitle(const char* value);
+	const char* GetTitle(void);
 };
 } // namespace MwOO