dwindows: dwtestoo.cpp comparison

comparison dwtestoo.cpp @ 2940:60e90b783cb1

C++: ListBox and ComboBoxes need to call Setup() to configure the handlers.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sun, 01 Jan 2023 01:14:55 +0000
parents	ebbc5b16899e
children	63d7baebb0d4

comparison

equal deleted inserted replaced

-:ebbc5b16899e
+:60e90b783cb1
 else if((mask & KC_ALT))
 return "KC_ALT";
 else return "none";
 }
-char *ReadFile(char *filename)
+char *ReadFile(char *filename) {
-{
 char *errors = NULL;
 FILE *fp=NULL;
 #ifdef __ANDROID__
 int fd = -1;
 #endif
 return errors;
 }
 // When hpm is not NULL we are printing.. so handle things differently
-void DrawFile(int row, int col, int nrows, int fheight, DW::Pixmap *hpm)
+void DrawFile(int row, int col, int nrows, int fheight, DW::Pixmap *hpm) {
-{
 DW::Pixmap *pixmap = hpm ? hpm : pixmap2;
 char buf[16] = {0};
 int i,y,fileline;
 char *pLine;
 }
 }
 }
 // When hpm is not NULL we are printing.. so handle things differently
-void DrawShapes(int direct, DW::Pixmap *hpm)
+void DrawShapes(int direct, DW::Pixmap *hpm) {
-{
 DW::Pixmap *pixmap = hpm ? hpm : pixmap2;
 int width = (int)pixmap->GetWidth(), height = (int)pixmap->GetHeight();
 int x[7] = { 20, 180, 180, 230, 180, 180, 20 };
 int y[7] = { 50, 50, 20, 70, 120, 90, 90 };
 DW::Drawable *drawable = direct ? static_cast<DW::Drawable *>(render2) : static_cast<DW::Drawable *>(pixmap);
 else
 drawable->BitBlt(imagexspin->GetPos(), imageyspin->GetPos(), (int)image->GetWidth(), (int)image->GetHeight(), image, 0, 0);
 }
 }
-void UpdateRender(void)
+void UpdateRender(void) {
-{
 switch(render_type)
 {
 case SHAPES_DOUBLE_BUFFERED:
 DrawShapes(FALSE, NULL);
 break;
 // Trigger expose event
 render1->Redraw();
 render2->Redraw();
 }
-DW::Menu *ItemContextMenu(DW::StatusText *status_text, const char *text)
+DW::Menu *ItemContextMenu(DW::StatusText *status_text, const char *text) {
-{
 DW::Menu *menu = new DW::Menu();
 DW::Menu *submenu = new DW::Menu();
 DW::MenuItem *menuitem = submenu->AppendItem("File", 0L, TRUE);
 menuitem->ConnectClicked([status_text, text]() -> int { status_text->SetText(text); return TRUE; });
 menuitem->ConnectClicked([status_text, text]() -> int { status_text->SetText(text); return TRUE; });
 menuitem->ConnectClicked([status_text, text]() -> int { status_text->SetText(text); return TRUE; });
 return menu;
 }
-DW::ComboBox *ColorCombobox(void)
+DW::ComboBox *ColorCombobox(void) {
-{
 DW::ComboBox *combobox = new DW::ComboBox("DW_CLR_DEFAULT");
 combobox->Append("DW_CLR_DEFAULT");
 combobox->Append("DW_CLR_BLACK");
 combobox->Append("DW_CLR_DARKRED");
 combobox->Append("DW_CLR_CYAN");
 combobox->Append("DW_CLR_WHITE");
 return combobox;
 }
-unsigned long ComboboxColor(const char *colortext)
+unsigned long ComboboxColor(const char *colortext) {
-{
 unsigned long color = DW_CLR_DEFAULT;
 if(strcmp(colortext, "DW_CLR_BLACK") == 0)
 color = DW_CLR_BLACK;
 else if(strcmp(colortext, "DW_CLR_DARKRED") == 0)
 color = DW_CLR_WHITE;
 return color;
 }
-void MLESetFont(DW::MLE *mle, int fontsize, char *fontname)
+void MLESetFont(DW::MLE *mle, int fontsize, char *fontname) {
-{
 char font[101] = {0};
 if(fontname)
 snprintf(font, 100, "%d.%s", fontsize, fontname);
 mle->SetFont(fontname ? font : NULL);
 }
 // Thread and Event functions
-void UpdateMLE(DW::MLE *threadmle, const char *text, DW::Mutex *mutex)
+void UpdateMLE(DW::MLE *threadmle, const char *text, DW::Mutex *mutex) {
-{
 static unsigned int pos = 0;
 // Protect pos from being changed by different threads
 if(mutex)
 mutex->Lock();
 // Add the "Help" menu to the menubar...
 menubar->AppendItem("~Help", menu);
 }
 // Notebook page 1
-void CreateInput(DW::Box *notebookbox)
+void CreateInput(DW::Box *notebookbox) {
-{
 DW::Box *lbbox = new DW::Box(DW_VERT, 10);
 notebookbox->PackStart(lbbox, 150, 70, TRUE, TRUE, 0);
 // Copy and Paste
 app->TaskBarInsert(render1, fileicon, "DWTest");
 }
 // Notebook page 3
-void CreateTree(DW::Box *notebookbox)
+void CreateTree(DW::Box *notebookbox) {
-{
 // create a box to pack into the notebook page
 DW::ListBox *listbox = new DW::ListBox(TRUE);
 notebookbox->PackStart(listbox, 500, 200, TRUE, TRUE, 0);
 listbox->Append("Test 1");
 listbox->Append("Test 2");
 notebookbox->PackStart(text, 500, 200, TRUE, TRUE, 1);
 }
 }
 // Page 4 - Container
-void CreateContainer(DW::Box *notebookbox)
+void CreateContainer(DW::Box *notebookbox) {
-{
 char buffer[101] = {0};
 CTIME time;
 CDATE date;
 // create a box to pack into the notebook page
 return FALSE;
 });
 }
 // Page 5 - Buttons
-void CreateButtons(DW::Box *notebookbox)
+void CreateButtons(DW::Box *notebookbox) {
-{
 // create a box to pack into the notebook page
 DW::Box *buttonsbox = new DW::Box(DW_VERT, 2);
 notebookbox->PackStart(buttonsbox, 25, 200, TRUE, TRUE, 0);
 buttonsbox->SetColor(DW_CLR_RED, DW_CLR_RED);
 return TRUE;
 });
 }
 // Page 6 - HTML
-void CreateHTML(DW::Box *notebookbox)
+void CreateHTML(DW::Box *notebookbox) {
-{
 DW::HTML *rawhtml = new DW::HTML();
 if(rawhtml && rawhtml->GetHWND())
 {
 DW::Box *hbox = new DW::Box(DW_HORZ, 0);
 DW::ComboBox *javascript = new DW::ComboBox();
 notebookbox->PackStart(htmltext, 0, 100, TRUE, TRUE, 0);
 }
 }
 // Page 7 - ScrollBox
-void CreateScrollBox(DW::Box *notebookbox)
+void CreateScrollBox(DW::Box *notebookbox) {
-{
 char buf[101] = {0};
 // create a box to pack into the notebook page
 DW::ScrollBox *scrollbox = new DW::ScrollBox(DW_VERT, 0);
 notebookbox->PackStart(scrollbox, 0, 0, TRUE, TRUE, 1);
 tmpbox->PackStart(entry, 0, DW_SIZE_AUTO, TRUE, FALSE, 0);
 }
 }
 // Page 8 - Thread and Event
-void CreateThreadEvent(DW::Box *notebookbox)
+void CreateThreadEvent(DW::Box *notebookbox) {
-{
 // create a box to pack into the notebook page
 DW::Box *tmpbox = new DW::Box(DW_VERT, 0);
 notebookbox->PackStart(tmpbox, 0, 0, TRUE, TRUE, 1);
 DW::Button *startbutton = new DW::Button("Start Threads");

Mercurial > dwindows

comparison dwtestoo.cpp @ 2940:60e90b783cb1